Integrated recent API-change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
545f9e3c7c
commit
eca370a9cf
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user