move 8 copies of the same function to common code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-06-11 05:23:53 +00:00
parent 980ebb9552
commit cabb286d30
9 changed files with 7 additions and 88 deletions

View File

@@ -751,47 +751,6 @@ wxMenuItem::~wxMenuItem()
// don't delete menu items, the menus take care of that
}
// return the menu item text without any menu accels
/* static */
wxString wxMenuItemBase::GetLabelText(const wxString& text)
{
// The argument to this function will now always be in wxWidgets standard label
// format, not GTK+ format, so we do what the other ports do.
return wxStripMenuCodes(text);
#if 0
wxString label;
for ( const wxChar *pc = text.c_str(); *pc; pc++ )
{
if ( *pc == wxT('\t'))
break;
if ( *pc == wxT('_') )
{
// GTK 1.2 escapes "xxx_xxx" to "xxx__xxx"
pc++;
label += *pc;
continue;
}
if ( (*pc == wxT('&')) && (*(pc+1) != wxT('&')) )
{
// wxMSW escapes "&"
// "&" is doubled to indicate "&" instead of accelerator
continue;
}
label += *pc;
}
// wxPrintf( wxT("GetLabelText(): text %s label %s\n"), text.c_str(), label.c_str() );
return label;
#endif
}
wxString wxMenuItem::GetItemLabel() const
{
wxString label = wxConvertFromGTKToWXLabel(m_text);