Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Menu fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-11 19:07:41 +00:00
parent 68bc148cac
commit 84c5131950
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/menu.cpp
View File

@@ -1082,7 +1082,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
GtkWidget *menuItem; GtkWidget *menuItem;
// cache some data used later // cache some data used later
wxString text = mitem->GetItemLabel(); wxString text = mitem->wxMenuItemBase::GetItemLabel();
int id = mitem->GetId(); int id = mitem->GetId();
bool isstock = wxIsStockID(id); bool isstock = wxIsStockID(id);
const char *stockid = NULL; const char *stockid = NULL;

4
src/gtk1/menu.cpp
View File

@@ -1027,7 +1027,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
} }
else if (mitem->GetBitmap().Ok()) else if (mitem->GetBitmap().Ok())
{ {
text = mitem->GetItemLabel(); text = mitem->wxMenuItembase::GetItemLabel();
const wxBitmap *bitmap = &mitem->GetBitmap(); const wxBitmap *bitmap = &mitem->GetBitmap();
// TODO // TODO
@@ -1040,7 +1040,7 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
else // a normal item else // a normal item
{ {
// text has "_" instead of "&" after mitem->SetItemLabel() so don't use it // text has "_" instead of "&" after mitem->SetItemLabel() so don't use it
text = mitem->GetItemLabel() ; text = mitem->wxMenuItemBase::GetItemLabel() ;
switch ( mitem->GetKind() ) switch ( mitem->GetKind() )
{ {