ROP changes.

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index f9e310d9a9994cc8a42def673c56bf4420b16ca1..f64f57eb17149c072396c6eb5dcea324c5e0de59 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -141,9 +141,10 @@ bool wxMenuItem::IsChecked() const
     return (flag & MF_CHECKED) != 0;
 }
 
-wxString wxMenuItem::GetLabel() const
+/* static */
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
 {
-    return wxStripMenuCodes(m_text);
+    return wxStripMenuCodes(text);
 }
 
 // accelerators
@@ -240,7 +241,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,