X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/338dd992160bf20205743c092b353d96ef7604fb..71e483d39adbc1c80ef2fa998bd7f18e1704440c:/src/motif/menuitem.cpp diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index d582065f47..a3081a45f7 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -60,9 +60,7 @@ static void wxMenuItemDisarmCallback(Widget w, XtPointer clientData, XtPointer p // dynamic classes implementation // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) -#endif //USE_SHARED_LIBRARY // ---------------------------------------------------------------------------- // wxMenuItem @@ -115,7 +113,7 @@ void wxMenuItem::DeleteSubMenu() void wxMenuItem::Enable(bool bDoEnable) { - if ( m_isChecked != bDoEnable ) + if ( m_isEnabled != bDoEnable ) { if ( !IsSubMenu() ) { @@ -156,12 +154,12 @@ void wxMenuItem::Check(bool bDoCheck) } } -wxString wxMenuItem::GetLabel() const +/* static */ +wxString wxMenuItemBase::GetLabelFromText(const wxString& text) { - return wxStripMenuCodes(m_text); + return wxStripMenuCodes(text); } - // ---------------------------------------------------------------------------- // wxMenuItemBase // ----------------------------------------------------------------------------