X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..51072df23ffcf5bdd4651dbe0ad5143b1e360119:/src/os2/menuitem.cpp?ds=sidebyside diff --git a/src/os2/menuitem.cpp b/src/os2/menuitem.cpp index 1d960c605b..6b4c37c65a 100644 --- a/src/os2/menuitem.cpp +++ b/src/os2/menuitem.cpp @@ -62,7 +62,7 @@ static wxString TextToLabel(const wxString& rTitle) { wxString Title; const wxChar *pc; - for (pc = rTitle; *pc != wxT('\0'); pc++ ) + for (pc = rTitle.c_str(); *pc != wxT('\0'); pc++ ) { if (*pc == wxT('&') ) { @@ -71,13 +71,9 @@ static wxString TextToLabel(const wxString& rTitle) pc++; Title << wxT('&'); } - else + else Title << wxT('~'); } -// else if (*pc == wxT('/')) -// { -// Title << wxT('\\'); -// } else { if ( *pc == wxT('~') ) @@ -208,18 +204,6 @@ wxString wxMenuItemBase::GetLabelFromText( return label; } -// accelerators -// ------------ - -#if wxUSE_ACCEL - -wxAcceleratorEntry *wxMenuItem::GetAccel() const -{ - return wxGetAccelFromString(GetText()); -} - -#endif // wxUSE_ACCEL - // change item state // -----------------