1. wxDialogs are now destroyed when they go out of scope

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index e5a55c54a9dfe659428cca0f4820483aebca9406..76fa0af2d9a02410e2979c8b2cb42061a85a19fd 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -29,25 +29,21 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/menu.h"
     #include "wx/font.h"
     #include "wx/bitmap.h"
     #include "wx/settings.h"
     #include "wx/font.h"
+    #include "wx/accel.h"
+    #include "wx/menu.h"
+    #include "wx/string.h"
+    #include "wx/window.h"
 #endif
 
 #include "wx/ownerdrw.h"
 #include "wx/menuitem.h"
+#include "wx/log.h"
 
-#include <windows.h>
-
-#ifdef GetClassInfo
-    #undef GetClassInfo
-#endif
-
-#ifdef GetClassName
-    #undef GetClassName
-#endif
+#include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 // convenience macro
@@ -91,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, _T("a menu item should have a parent") );
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
@@ -109,6 +105,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
     m_pParentMenu = pParentMenu;
     m_pSubMenu    = pSubMenu;
     m_bEnabled    = TRUE;
+    m_bChecked    = FALSE;
     m_idItem      = id;
 }
 
@@ -154,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(), _T("only checkable items may be checked") );
 
     if ( m_bChecked != bDoCheck ) {
         long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
@@ -195,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
@@ -213,7 +210,7 @@ void wxMenuItem::SetName(const wxString& strName)
                           MF_BYCOMMAND | flagsOld,
                           id, data) == 0xFFFFFFFF )
         {
-            wxLogLastError("ModifyMenu");
+            wxLogLastError(_T("ModifyMenu"));
         }
     }
 }