1. always create the buttons with WS_CLIPSIBLINGS style, this prevetns them

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 66157cb2cf38ad25fd41a23a258692bc89313b20..33e67a5d9fe3f9cc04d1532e35348bef804ef6ea 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,13 +72,7 @@
 // dynamic classes implementation
 // ----------------------------------------------------------------------------
 
 // 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
+IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)

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


@@ -90,24 +86,27 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        const wxString& text,
                        const wxString& strHelp,
                        bool bCheckable,
                        const wxString& text,
                        const wxString& strHelp,
                        bool bCheckable,

-                       wxMenu *pSubMenu) :
+                       wxMenu *pSubMenu)

 #if wxUSE_OWNER_DRAWN
 #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") );
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors
 #endif // owner drawn
 {
     wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
 
 #if  wxUSE_OWNER_DRAWN
     // set default menu colors

-    #define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
+    #define SYS_COLOR(c) (wxSystemSettings::GetColour(wxSYS_COLOUR_##c))

 
     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;


@@ -143,23 +142,12 @@ bool wxMenuItem::IsChecked() const
     return (flag & MF_CHECKED) != 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
-// ------------
-
-#if wxUSE_ACCEL
-
-wxAcceleratorEntry *wxMenuItem::GetAccel() const
-{
-    return wxGetAccelFromString(GetText());
-}
-
-#endif // wxUSE_ACCEL
-

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


@@ -174,7 +162,7 @@ void wxMenuItem::Enable(bool enable)
                              (enable ? MF_ENABLED : MF_GRAYED));
 
     if ( rc == -1 ) {
                              (enable ? MF_ENABLED : MF_GRAYED));
 
     if ( rc == -1 ) {

-        wxLogLastError("EnableMenuItem");
+        wxLogLastError(wxT("EnableMenuItem"));

     }
 
     wxMenuItemBase::Enable(enable);
     }
 
     wxMenuItemBase::Enable(enable);


@@ -193,7 +181,7 @@ void wxMenuItem::Check(bool check)
                             (check ? MF_CHECKED : MF_UNCHECKED));
 
     if ( rc == -1 ) {
                             (check ? MF_CHECKED : MF_UNCHECKED));
 
     if ( rc == -1 ) {

-        wxLogLastError("CheckMenuItem");
+        wxLogLastError(wxT("CheckMenuItem"));

     }
 
     wxMenuItemBase::Check(check);
     }
 
     wxMenuItemBase::Check(check);


@@ -219,7 +207,7 @@ void wxMenuItem::SetText(const wxString& text)
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {
     UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
     if ( flagsOld == 0xFFFFFFFF )
     {

-        wxLogLastError("GetMenuState");
+        wxLogLastError(wxT("GetMenuState"));

     }
     else
     {
     }
     else
     {


@@ -242,7 +230,7 @@ void wxMenuItem::SetText(const wxString& text)
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;
 #endif  //owner drawn
         {
             flagsOld |= MF_STRING;

-            data = (char*) text.c_str();
+            data = (wxChar*) text.c_str();

         }
 
         if ( ::ModifyMenu(hMenu, id,
         }
 
         if ( ::ModifyMenu(hMenu, id,


@@ -273,3 +261,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