From: Mart Raudsepp Date: Fri, 3 Feb 2006 23:07:20 +0000 (+0000) Subject: GTK: gtk_menu_{insert,append} -> gtk_menu_shell_{insert,append} X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1ab9e06d6ac4c1ac41fdbe88b0862dc62a2112f9?ds=inline GTK: gtk_menu_{insert,append} -> gtk_menu_shell_{insert,append} git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index ef1d9b5280..8765445a98 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -495,7 +495,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // sorted control, need to insert at the correct index index = m_strings->Add(item); - gtk_menu_insert( GTK_MENU(menu), menu_item, index ); + gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, index ); if ( index ) { @@ -515,13 +515,13 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // normal control, just append if (pos == (int)m_clientList.GetCount()) { - gtk_menu_append( GTK_MENU(menu), menu_item ); + gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item ); m_clientList.Append( (wxObject*) NULL ); index = m_clientList.GetCount() - 1; } else { - gtk_menu_insert( GTK_MENU(menu), menu_item, pos ); + gtk_menu_shell_insert( GTK_MENU_SHELL(menu), menu_item, pos ); m_clientList.Insert( pos, (wxObject*) NULL ); index = pos; } diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index 10dfc43511..10763c9f01 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -924,7 +924,7 @@ void wxMenu::Init() { GtkWidget *tearoff = gtk_tearoff_menu_item_new(); - gtk_menu_append(GTK_MENU(m_menu), tearoff); + gtk_menu_shell_append(GTK_MENU_SHELL(m_menu), tearoff); } m_prevRadio = NULL;