ROP changes.

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 2e981bba71976abc1a8775a02ce8e18bf5c27fdb..f64f57eb17149c072396c6eb5dcea324c5e0de59 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -70,13 +70,11 @@
 // 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
     #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

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


@@ -90,9 +88,9 @@ 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(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") );


@@ -140,13 +138,13 @@ bool wxMenuItem::IsChecked() const
 {
     int flag = ::GetMenuState(GetHMenuOf(m_parentMenu), GetId(), MF_BYCOMMAND);
 
 {
     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
 }
 
 // accelerators


@@ -243,7 +241,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,