Create a text measuring context until a real context is assigned, this allows things...

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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 8bbe72a03bb951325cf8265611cd39b8612941d4..93984343d1f2d3a3c00b0218fee417ebe8d6a32d 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -399,7 +399,7 @@ HBITMAP GetHBitmapForMenu(wxMenuItem *pItem, bool checked = true)
                 pItem->SetBitmap(img, checked);
             }
 
-            return GetHbitmapOf(pItem->GetBitmap());
+            return GetHbitmapOf(pItem->GetBitmap(checked));
         }
     }
 #endif // wxUSE_IMAGE
@@ -564,7 +564,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                 // the app from starting up under Windows 95/NT 4
                 typedef BOOL (WINAPI *SetMenuInfo_t)(HMENU, MENUINFO *);
 
-                wxDynamicLibrary dllUser(_T("user32"));
+                wxDynamicLibrary dllUser(wxT("user32"));
                 wxDYNLIB_FUNCTION(SetMenuInfo_t, SetMenuInfo, dllUser);
                 if ( pfnSetMenuInfo )
                 {
@@ -572,7 +572,7 @@ bool wxMenu::DoInsertOrAppend(wxMenuItem *pItem, size_t pos)
                     mi.dwStyle = MNS_CHECKORBMP;
                     if ( !(*pfnSetMenuInfo)(GetHmenu(), &mi) )
                     {
-                        wxLogLastError(_T("SetMenuInfo(MNS_NOCHECK)"));
+                        wxLogLastError(wxT("SetMenuInfo(MNS_NOCHECK)"));
                     }
                 }
 
@@ -639,7 +639,7 @@ void wxMenu::EndRadioGroup()
 
 wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
 {
-    wxCHECK_MSG( item, NULL, _T("NULL item in wxMenu::DoAppend") );
+    wxCHECK_MSG( item, NULL, wxT("NULL item in wxMenu::DoAppend") );
 
     bool check = false;
 
@@ -671,7 +671,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
             }
             else
             {
-                wxFAIL_MSG( _T("where is the radio group start item?") );
+                wxFAIL_MSG( wxT("where is the radio group start item?") );
             }
         }
     }