include/wx/choice.hpragma warning is only for VC++

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index fa63e469a82dd29fdb3552ca8a85c855e3d798d0..f40498487b497b27c0c7bb11b66335746fc4c5ee 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -33,10 +33,10 @@
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/font.h"
+    #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/menu.h"
     #include "wx/string.h"
-    #include "wx/window.h"
 #endif
 
 #include "wx/ownerdrw.h"
@@ -87,7 +87,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
 #endif  //owner drawn
                         m_strHelp(strHelp)
 {
-    wxASSERT_MSG( pParentMenu != NULL, "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
@@ -151,7 +151,7 @@ void wxMenuItem::Enable(bool bDoEnable)
 
 void wxMenuItem::Check(bool bDoCheck)
 {
-    wxCHECK_RET( IsCheckable(), "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),
@@ -192,12 +192,12 @@ void wxMenuItem::SetName(const wxString& strName)
             flagsOld |= MF_POPUP;
         }
 
-        LPCSTR data;
+        LPCTSTR data;
 #if wxUSE_OWNER_DRAWN
         if ( IsOwnerDrawn() )
         {
             flagsOld |= MF_OWNERDRAW;
-            data = (LPCSTR)this;
+            data = (LPCTSTR)this;
         }
         else
 #endif  //owner drawn
@@ -208,9 +208,9 @@ void wxMenuItem::SetName(const wxString& strName)
 
         if ( ::ModifyMenu(hMenu, id,
                           MF_BYCOMMAND | flagsOld,
-                          id, data) == 0xFFFFFFFF )
+                          id, data) == (int)0xFFFFFFFF )
         {
-            wxLogLastError("ModifyMenu");
+            wxLogLastError(wxT("ModifyMenu"));
         }
     }
 }