From eca370a9cf88259480e9f34afc17347ce603ff37 Mon Sep 17 00:00:00 2001 From: Stefan Neis Date: Sun, 23 Jan 2000 17:54:14 +0000 Subject: [PATCH] Integrated recent API-change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/menuitem.h | 1 - src/os2/menuitem.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/wx/os2/menuitem.h b/include/wx/os2/menuitem.h index 3aecc077cf..f9ebaf8659 100644 --- 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); - virtual wxString GetLabel() const; virtual void SetCheckable(bool checkable); virtual void Enable(bool bDoEnable = TRUE); diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 6382eaa1d4..9b9143b352 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -137,9 +137,9 @@ bool wxMenuItem::IsChecked() const return FALSE; } -wxString wxMenuItem::GetLabel() const +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { - return wxStripMenuCodes(m_text); + return wxStripMenuCodes(text); } // accelerators -- 2.50.0