Fixes for OS/2 wxUniv merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -71,7 +71,7 @@ static wxString TextToLabel(const wxString& rTitle)
|
||||
pc++;
|
||||
Title << wxT('&');
|
||||
}
|
||||
else
|
||||
else
|
||||
Title << wxT('~');
|
||||
}
|
||||
// else if (*pc == wxT('/'))
|
||||
@@ -208,18 +208,6 @@ wxString wxMenuItemBase::GetLabelFromText(
|
||||
return label;
|
||||
}
|
||||
|
||||
// accelerators
|
||||
// ------------
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
|
||||
wxAcceleratorEntry *wxMenuItem::GetAccel() const
|
||||
{
|
||||
return wxGetAccelFromString(GetText());
|
||||
}
|
||||
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
// change item state
|
||||
// -----------------
|
||||
|
||||
|
||||
Reference in New Issue
Block a user