From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 13 Aug 2007 14:43:39 +0000 (+0000)
Subject: Add accelerator back to label in GetItemLabel
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a738f87caeafd5e51fc029a6228c540e942505b7

Add accelerator back to label in GetItemLabel


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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 )