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 51fa71566cbdfef088f762cfe4b8035b8126d833..82b03573ef2434dcd8edacf3fe605d881a86b44d 100644 (file)
--- 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 28436b74844c8689fdebe443e855d947972d742f..5e3f79fba58f4086a7ea4fd859a439f180d7ea53 100644 (file)
--- 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() )
         {