X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6de97a3b945c99fb942209df48be26f43c1b436d..8b21b87fe330378e8bc448eee2494e3dd2c97a37:/src/gtk1/menu.cpp diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index 35832b897f..6cd28ae420 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -254,7 +254,7 @@ void wxMenu::Append( int id, const wxString &item, const wxString &helpStr, bool wxMenuItem *mitem = new wxMenuItem(); mitem->SetId(id); mitem->SetText(item); - mitem->SetHelpString(helpStr); + mitem->SetHelp(helpStr); mitem->SetCheckable(checkable); const char *text = mitem->GetText(); GtkWidget *menuItem = checkable ? gtk_check_menu_item_new_with_label(text) @@ -277,7 +277,7 @@ void wxMenu::Append( int id, const wxString &text, wxMenu *subMenu, const wxStri mitem->SetText(text); GtkWidget *menuItem = gtk_menu_item_new_with_label(mitem->GetText()); - mitem->SetHelpString(helpStr); + mitem->SetHelp(helpStr); mitem->SetMenuItem(menuItem); mitem->SetSubMenu(subMenu); @@ -344,10 +344,30 @@ bool wxMenu::IsChecked( int id ) const void wxMenu::SetLabel( int id, const wxString &label ) { wxMenuItem *item = FindItem(id); - if ( item ) + if (item) item->SetText(label); } +wxString wxMenu::GetLabel( int id ) const +{ + wxMenuItem *item = FindItem(id); + if (item) return item->GetText(); + return ""; +} + +void wxMenu::SetHelpString( int id, const wxString& helpString ) +{ + wxMenuItem *item = FindItem(id); + if (item) item->SetHelp( helpString ); +} + +wxString wxMenu::GetHelpString( int id ) const +{ + wxMenuItem *item = FindItem(id); + if (item) return item->GetHelp(); + return ""; +} + int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const { wxNode *node = m_items.First();