From c0cdb2ad99a1e2a6ade5ce76c91177a79258e669 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:10:11 +0200
Subject: 3.14

---
 ui/tray_icon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/tray_icon.h')

diff --git a/ui/tray_icon.h b/ui/tray_icon.h
index 1207d1fa..af9200d1 100644
--- a/ui/tray_icon.h
+++ b/ui/tray_icon.h
@@ -14,7 +14,7 @@
 class MinimizeToTray : private wxEvtHandler
 {
 public:
-    MinimizeToTray(wxTopLevelWindow* callerWnd, wxWindow* secondWnd = NULL); //ensure callerWind has longer lifetime!
+    MinimizeToTray(wxTopLevelWindow* callerWnd, wxTopLevelWindow* secondWnd = NULL); //ensure both windows have longer lifetime than this instance!
     ~MinimizeToTray(); //show windows again
 
     void setToolTip(const wxString& toolTipText, size_t percent = 0); //percent (optional), number between [0, 100], for small progress indicator
@@ -26,7 +26,7 @@ private:
     void resumeFromTray();
 
     wxTopLevelWindow* callerWnd_;
-    wxWindow* secondWnd_;
+    wxTopLevelWindow* secondWnd_;
     class TaskBarImpl;
     TaskBarImpl* trayIcon; //actual tray icon (don't use inheritance to enable delayed deletion)
 };
-- 
cgit