X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/717a57c2fabb054c8f00dc5dae70df1d03cfe532..87df17a11b0017d31c09f767bd921abb27193bee:/src/msw/menuitem.cpp

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 2e981bba71..6d084e9d4d 100644
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -70,13 +70,11 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
-#if     !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY
-    #if wxUSE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
-    #else   //!USE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
-    #endif  //USE_OWNER_DRAWN
-#endif  //USE_SHARED_LIBRARY
+#if wxUSE_OWNER_DRAWN
+    IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
+#else   //!USE_OWNER_DRAWN
+    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+#endif  //USE_OWNER_DRAWN
 
 // ----------------------------------------------------------------------------
 // wxMenuItem
@@ -90,9 +88,9 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        const wxString& text,
                        const wxString& strHelp,
                        bool bCheckable,
-                       wxMenu *pSubMenu) :
+                       wxMenu *pSubMenu)
 #if wxUSE_OWNER_DRAWN
-                        wxOwnerDrawn(text, bCheckable)
+                       : wxOwnerDrawn(GetLabelFromText(text), bCheckable)
 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
@@ -104,10 +102,13 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
+    #undef  SYS_COLOR
+
     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 
-    #undef  SYS_COLOR
+    // tell the owner drawing code to to show the accel string as well
+    SetAccelString(text.AfterFirst(_T('\t')));
 #endif // wxUSE_OWNER_DRAWN
 
     m_parentMenu  = pParentMenu;
@@ -140,13 +141,13 @@ bool wxMenuItem::IsChecked() const
 {
     int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
 
-    // don't "and" with MF_ENABLED because its value is 0
-    return (flag & MF_DISABLED) == 0;
+    return (flag & MF_CHECKED) != 0;
 }
 
-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
-    return wxStripMenuCodes(m_text);
+    return wxStripMenuCodes(text);
 }
 
 // accelerators
@@ -175,7 +176,7 @@ void wxMenuItem::Enable(bool enable)
                              (enable ? MF_ENABLED : MF_GRAYED));
 
     if ( rc == -1 ) {
-        wxLogLastError("EnableMenuItem");
+        wxLogLastError(wxT("EnableMenuItem"));
     }
 
     wxMenuItemBase::Enable(enable);
@@ -194,7 +195,7 @@ void wxMenuItem::Check(bool check)
                             (check ? MF_CHECKED : MF_UNCHECKED));
 
     if ( rc == -1 ) {
-        wxLogLastError("CheckMenuItem");
+        wxLogLastError(wxT("CheckMenuItem"));
     }
 
     wxMenuItemBase::Check(check);
@@ -220,7 +221,7 @@ void wxMenuItem::SetText(const wxString& text)
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {
-        wxLogLastError("GetMenuState");
+        wxLogLastError(wxT("GetMenuState"));
     }
     else
     {
@@ -243,7 +244,7 @@ void wxMenuItem::SetText(const wxString& text)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
-            data = (char*) text.c_str();
+            data = (wxChar*) text.c_str();
         }
 
         if ( ::ModifyMenu(hMenu, id,