Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add accelerator back to label in GetItemLabel

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-13 14:43:39 +00:00
parent 387c7b3eef
commit a738f87cae
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gtk/menu.cpp
View File

@@ -796,7 +796,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
wxString wxMenuItem::GetItemLabel() const wxString wxMenuItem::GetItemLabel() const
{ {
return wxConvertFromGTKToWXLabel(m_text); wxString label = wxConvertFromGTKToWXLabel(m_text);
if (!m_hotKey.IsEmpty())
label = label + wxT("\t") + m_hotKey;
return label;
} }
void wxMenuItem::SetItemLabel( const wxString& str ) void wxMenuItem::SetItemLabel( const wxString& str )

5
src/gtk1/menu.cpp
View File

@@ -794,7 +794,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text)
wxString wxMenuItem::GetItemLabel() const wxString wxMenuItem::GetItemLabel() const
{ {
return wxConvertFromGTKToWXLabel(m_text); wxString label = wxConvertFromGTKToWXLabel(m_text);
if (!m_hotKey.IsEmpty())
label = label + wxT("\t") + m_hotKey;
return label;
} }
void wxMenuItem::SetItemLabel( const wxString& string ) void wxMenuItem::SetItemLabel( const wxString& string )