Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index fc4f1cb9ca45607fe2b69d5b25f784eede15f2da..0cab9d2d3aecfdb2f333eca1ce15d7eda95b10ac 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -113,10 +113,10 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
         notifyData.hWnd = (HWND) m_hWnd;
         notifyData.uCallbackMessage = sm_taskbarMsg;
         notifyData.uFlags = NIF_MESSAGE ;
         notifyData.hWnd = (HWND) m_hWnd;
         notifyData.uCallbackMessage = sm_taskbarMsg;
         notifyData.uFlags = NIF_MESSAGE ;

-        if (icon.Ok())
+    if (icon.Ok())

     {
     {

-                notifyData.uFlags |= NIF_ICON;
-            notifyData.hIcon = (HICON) icon.GetHICON();
+        notifyData.uFlags |= NIF_ICON;
+        notifyData.hIcon = (HICON) icon.GetHICON();

     }
 
     if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
     }
 
     if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))


@@ -182,8 +182,14 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
 
     menu->UpdateUI();
 
 
     menu->UpdateUI();
 

+    // Work around a WIN32 bug
+    ::SetForegroundWindow ((HWND) win->GetHWND ());
+

     rval = win->PopupMenu(menu, 0, 0);
 
     rval = win->PopupMenu(menu, 0, 0);
 

+    // Work around a WIN32 bug
+    ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
+

     win->PopEventHandler(FALSE);
     win->Destroy();
     delete win;
     win->PopEventHandler(FALSE);
     win->Destroy();
     delete win;