From a738f87caeafd5e51fc029a6228c540e942505b7 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 13 Aug 2007 14:43:39 +0000 Subject: [PATCH] Add accelerator back to label in GetItemLabel git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 5 ++++- src/gtk1/menu.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 9c8df7c078..002d5f5668 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -796,7 +796,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text) 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 ) diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 5e3f79fba5..cfd9427eb3 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -794,7 +794,10 @@ wxString wxMenuItemBase::GetLabelText(const wxString& text) 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 ) -- 2.45.2