Removing some level 3 warning

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 0fa9ef3a20c99e06dc2b4419fce06a7e3c3775b4..36d0de6c5235e3e2ed03d63d09e331ec6e733358 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -158,6 +158,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;
@@ -177,7 +187,9 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 
     win->PopEventHandler(FALSE);
     win->Destroy();
-    //delete win;
+    delete win;
+
+    s_inPopup = FALSE;
 
     return rval;
 }