X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/837e57436a89516a5fa9f478f401e06bd872c17c..d9317fd47263a9521466156d7bf0f7988000bf15:/src/msw/taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index fdf563dc37..cc82231d23 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -26,18 +26,24 @@
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
+#include "wx/menu.h"
 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include <windows.h>
+
+#include "wx/msw/winundef.h"
+
 #include <string.h>
-#include <wx/msw/taskbar.h>
-#include <wx/msw/private.h>
+#include "wx/msw/taskbar.h"
+#include "wx/msw/private.h"
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
-#include <wx/msw/gnuwin32/extra.h>
+#ifndef wxUSE_NORLANDER_HEADERS
+#include "wx/msw/gnuwin32/extra.h"
+#endif
 #endif
 #endif
 
@@ -48,14 +54,13 @@
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
 				     UINT wParam, LONG lParam );
 
-wxChar *wxTaskBarWindowClass = _T("wxTaskBarWindowClass");
+wxChar *wxTaskBarWindowClass = wxT("wxTaskBarWindowClass");
 
 wxList wxTaskBarIcon::sm_taskBarIcons;
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;
 UINT   wxTaskBarIcon::sm_taskbarMsg = 0;
 
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxTaskBarIcon, wxEvtHandler)
     EVT_TASKBAR_MOVE         (wxTaskBarIcon::_OnMouseMove)
     EVT_TASKBAR_LEFT_DOWN    (wxTaskBarIcon::_OnLButtonDown)
@@ -68,7 +73,6 @@ END_EVENT_TABLE()
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTaskBarIcon, wxEvtHandler)
-#endif
 
 
 wxTaskBarIcon::wxTaskBarIcon(void)
@@ -117,7 +121,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 	    notifyData.hIcon = (HICON) icon.GetHICON();
     }
 
-    if (((const wxChar*) tooltip != NULL) && (tooltip != _T("")))
+    if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
     {
         notifyData.uFlags |= NIF_TIP ;
 		lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
@@ -155,6 +159,16 @@ bool wxTaskBarIcon::RemoveIcon(void)
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 {
+    // OK, so I know this isn't thread-friendly, but
+    // what to do? We need this check.
+
+    static bool s_inPopup = FALSE;
+
+    if (s_inPopup)
+        return FALSE;
+
+    s_inPopup = TRUE;
+
     bool        rval = FALSE;
     wxWindow*   win;
     int         x, y;
@@ -164,10 +178,20 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     win = new wxFrame(NULL, -1, "", wxPoint(x,y), wxSize(-1,-1), 0);
     win->PushEventHandler(this);
 
+    // Remove from record of top-level windows, or will confuse wxWindows
+    // if we try to exit right now.
+    wxTopLevelWindows.DeleteObject(win);
+
+    menu->UpdateUI();
+
     rval = win->PopupMenu(menu, 0, 0);
 
     win->PopEventHandler(FALSE);
     win->Destroy();
+    delete win;
+
+    s_inPopup = FALSE;
+
     return rval;
 }
 
@@ -239,7 +263,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
         return TRUE;
 
     // Also register the taskbar message here
-    sm_taskbarMsg = ::RegisterWindowMessage(_T("wxTaskBarIconMessage"));
+    sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
 
     WNDCLASS	wc;
     bool	rc;
@@ -271,7 +295,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
-            _T("wxTaskBarWindow"),
+            wxT("wxTaskBarWindow"),
             WS_OVERLAPPED,
             0,
             0,