X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..efd1393bccefbb6cf12f82d5e10a4fb6080e6702:/src/motif/menuitem.cpp diff --git a/src/motif/menuitem.cpp b/src/motif/menuitem.cpp index 01ed0ccdaa..bb464edeae 100644 --- a/src/motif/menuitem.cpp +++ b/src/motif/menuitem.cpp @@ -21,6 +21,8 @@ // headers // ---------------------------------------------------------------------------- +#include "wx/defs.h" + #include "wx/menu.h" #include "wx/menuitem.h" #include "wx/utils.h" @@ -113,7 +115,7 @@ void wxMenuItem::DeleteSubMenu() void wxMenuItem::Enable(bool bDoEnable) { - if ( m_isChecked != bDoEnable ) + if ( m_isEnabled != bDoEnable ) { if ( !IsSubMenu() ) { @@ -154,12 +156,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 // ----------------------------------------------------------------------------