GetLabelTop should return the stripped label, for compatibility.

[wxWidgets.git] / src / gtk / menu.cpp

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 51fa71566cbdfef088f762cfe4b8035b8126d833..002d5f5668b3f7ba091c7bff6135cae4da6347d9 100644 (file)
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -747,10 +747,6 @@ wxMenuItem::~wxMenuItem()
 // return the menu item text without any menu accels
 /* static */
 
-// TODO: this is now wrong, because it will be used by public APIs
-// to convert from label-with-wxWidgets-hotkeys to plain text,
-// and this function converts from GTK+ hotkeys to plain text.
-
 wxString wxMenuItemBase::GetLabelText(const wxString& text)
 {
     // The argument to this function will now always be in wxWidgets standard label
@@ -800,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 )
@@ -1082,7 +1081,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     GtkWidget *menuItem;
 
     // cache some data used later
-    wxString text = mitem->GetItemLabel();
+    wxString text = mitem->wxMenuItemBase::GetItemLabel();
     int id = mitem->GetId();
     bool isstock = wxIsStockID(id);
     const char *stockid = NULL;