Applied Diana's font patch II

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index f95be7f54005f878b28b138c1a1a1809a9b3d4a7..f40498487b497b27c0c7bb11b66335746fc4c5ee 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -87,7 +87,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 #endif  //owner drawn
                         m_strHelp(strHelp)
 {
 #endif  //owner drawn
                         m_strHelp(strHelp)
 {

-    wxASSERT_MSG( pParentMenu != NULL, T("a menu item should have a parent") );
+    wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );

 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors


@@ -151,7 +151,7 @@ void wxMenuItem::Enable(bool bDoEnable)
 
 void wxMenuItem::Check(bool bDoCheck)
 {
 
 void wxMenuItem::Check(bool bDoCheck)
 {

-    wxCHECK_RET( IsCheckable(), T("only checkable items may be checked") );
+    wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );

 
     if ( m_bChecked != bDoCheck ) {
         long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
 
     if ( m_bChecked != bDoCheck ) {
         long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),


@@ -208,9 +208,9 @@ void wxMenuItem::SetName(const wxString& strName)
 
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,
 
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,

-                          id, data) == 0xFFFFFFFF )
+                          id, data) == (int)0xFFFFFFFF )

         {
         {

-            wxLogLastError(T("ModifyMenu"));
+            wxLogLastError(wxT("ModifyMenu"));

         }
     }
 }
         }
     }
 }