bitmap and image updates

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index e9ba5a03c6f7c55cfee7ee6af71ab87b8266739c..9b2f4eeb50741017e86e248dcd9ee9be5344c3e9 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -26,19 +26,20 @@
 #include "wx/window.h"
 #include "wx/frame.h"
 #include "wx/utils.h"
 #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 <string.h>
 #endif
 
 #if defined(__WIN95__) && !defined(__TWIN32__)
 
 #include <windows.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__
 #ifndef wxUSE_NORLANDER_HEADERS
 
 #ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #ifndef wxUSE_NORLANDER_HEADERS

-#include <wx/msw/gnuwin32/extra.h>
+#include "wx/msw/gnuwin32/extra.h"

 #endif
 #endif
 #endif
 #endif
 #endif
 #endif


@@ -50,7 +51,7 @@
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                     UINT wParam, LONG lParam );
 
 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;
 
 wxList wxTaskBarIcon::sm_taskBarIcons;
 bool   wxTaskBarIcon::sm_registeredClass = FALSE;


@@ -119,7 +120,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
            notifyData.hIcon = (HICON) icon.GetHICON();
     }
 
            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));
     {
         notifyData.uFlags |= NIF_TIP ;
                lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));


@@ -157,6 +158,16 @@ bool wxTaskBarIcon::RemoveIcon(void)
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 {
 
 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;
     bool        rval = FALSE;
     wxWindow*   win;
     int         x, y;


@@ -170,12 +181,16 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     // if we try to exit right now.
     wxTopLevelWindows.DeleteObject(win);
 
     // 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;
 
     rval = win->PopupMenu(menu, 0, 0);
 
     win->PopEventHandler(FALSE);
     win->Destroy();
     delete win;
 

+    s_inPopup = FALSE;
+

     return rval;
 }
 
     return rval;
 }
 


@@ -247,7 +262,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
         return TRUE;
 
     // Also register the taskbar message here
         return TRUE;
 
     // Also register the taskbar message here

-    sm_taskbarMsg = ::RegisterWindowMessage(_T("wxTaskBarIconMessage"));
+    sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));

 
     WNDCLASS   wc;
     bool       rc;
 
     WNDCLASS   wc;
     bool       rc;


@@ -279,7 +294,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
     HINSTANCE hInstance = GetModuleHandle(NULL);
 
     HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,

-            _T("wxTaskBarWindow"),
+            wxT("wxTaskBarWindow"),

             WS_OVERLAPPED,
             0,
             0,
             WS_OVERLAPPED,
             0,
             0,