From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 11 Aug 2007 19:07:41 +0000 (+0000)
Subject: Menu fix
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/84c5131950767b011faa9cbab9ef389923d17597

Menu fix


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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 51fa71566c..82b03573ef 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -1082,7 +1082,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;
diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp
index 28436b7484..5e3f79fba5 100644
--- a/src/gtk1/menu.cpp
+++ b/src/gtk1/menu.cpp
@@ -1027,7 +1027,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     }
     else if (mitem->GetBitmap().Ok())
     {
-        text = mitem->GetItemLabel();
+        text = mitem->wxMenuItembase::GetItemLabel();
         const wxBitmap *bitmap = &mitem->GetBitmap();
 
         // TODO
@@ -1040,7 +1040,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
     else // a normal item
     {
         // text has "_" instead of "&" after mitem->SetItemLabel() so don't use it
-        text =  mitem->GetItemLabel() ;
+        text =  mitem->wxMenuItemBase::GetItemLabel() ;
 
         switch ( mitem->GetKind() )
         {