added wxLog::Suspend/Resume and wxYield() uses them now so that it won't flush

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 2039b073f0732b1c211d0e74f99238487e475ace..f64f57eb17149c072396c6eb5dcea324c5e0de59 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -88,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") );


@@ -141,9 +141,10 @@ 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
 }
 
 // accelerators


@@ -240,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,