Tries to fix wxListBox focus problems.

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index e281013c2d9b2a6eed115c2a548a17f7ce73790d..c87a217ce6f8b60ec15e2c8c7e8eb647cdd48f48 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MENUS
+

 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"
 #ifndef WX_PRECOMP
     #include "wx/font.h"
     #include "wx/bitmap.h"


@@ -70,11 +72,11 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 

-    #if wxUSE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
-    #else   //!USE_OWNER_DRAWN
-        IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
-    #endif  //USE_OWNER_DRAWN
+#if wxUSE_OWNER_DRAWN
+    IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxMenuItemBase, wxOwnerDrawn)
+#else   //!USE_OWNER_DRAWN
+    IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxMenuItemBase)
+#endif  //USE_OWNER_DRAWN

 
 // ----------------------------------------------------------------------------
 // wxMenuItem
 
 // ----------------------------------------------------------------------------
 // wxMenuItem


@@ -90,7 +92,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        bool bCheckable,
                        wxMenu *pSubMenu)
 #if wxUSE_OWNER_DRAWN
                        bool bCheckable,
                        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") );
 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );


@@ -102,10 +104,13 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 
     SetTextColour(SYS_COLOR(MENUTEXT));
     SetBackgroundColour(SYS_COLOR(MENU));
 

+    #undef  SYS_COLOR
+

     // we don't want normal items be owner-drawn
     ResetOwnerDrawn();
 
     // 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;
 #endif // wxUSE_OWNER_DRAWN
 
     m_parentMenu  = pParentMenu;


@@ -147,18 +152,6 @@ wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
     return wxStripMenuCodes(text);
 }
 
     return wxStripMenuCodes(text);
 }
 

-// accelerators
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
-{
-    return wxGetAccelFromString(GetText());
-}
-
-#endif // wxUSE_ACCEL
-

 // change item state
 // -----------------
 
 // change item state
 // -----------------
 


@@ -272,3 +265,5 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
 {
     return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
 }
 {
     return new wxMenuItem(parentMenu, id, name, help, isCheckable, subMenu);
 }

+
+#endif // wxUSE_MENUS