Integrated recent API-change

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h
index 3aecc077cf671cce3dda3e54c379a1ed9017f63b..f9ebaf86593b8e098d7c16e573c460e1ab135295 100644 (file)
--- a/include/wx/os2/menuitem.h
+++ b/include/wx/os2/menuitem.h
@@ -50,7 +50,6 @@ public:
 
     // override base class virtuals
     virtual void SetText(const wxString& strName);
 
     // override base class virtuals
     virtual void SetText(const wxString& strName);

-    virtual wxString GetLabel() const;

     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);
     virtual void SetCheckable(bool checkable);
 
     virtual void Enable(bool bDoEnable = TRUE);

diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp
index 6382eaa1d4be388bcd26949a09999dadf24ec253..9b9143b352a42229030a6942b39926bbce7adc52 100644 (file)
--- a/src/os2/menuitem.cpp
+++ b/src/os2/menuitem.cpp
@@ -137,9 +137,9 @@ bool wxMenuItem::IsChecked() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-wxString wxMenuItem::GetLabel() const
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)

 {
 {

-    return wxStripMenuCodes(m_text);
+    return wxStripMenuCodes(text);

 }
 
 // accelerators
 }
 
 // accelerators