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

GTK: gtk_menu_{insert,append} -> gtk_menu_shell_{insert,append}

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-02-03 23:07:20 +00:00
parent c0ab3f7fbb
commit 1ab9e06d6a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/choice.cpp
View File

@@ -495,7 +495,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
// sorted control, need to insert at the correct index // sorted control, need to insert at the correct index
index = m_strings->Add(item); 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 ) if ( index )
{ {
@@ -515,13 +515,13 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
// normal control, just append // normal control, just append
if (pos == (int)m_clientList.GetCount()) 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 ); m_clientList.Append( (wxObject*) NULL );
index = m_clientList.GetCount() - 1; index = m_clientList.GetCount() - 1;
} }
else 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 ); m_clientList.Insert( pos, (wxObject*) NULL );
index = pos; index = pos;
} }

2
src/gtk/menu.cpp
View File

@@ -924,7 +924,7 @@ void wxMenu::Init()
{ {
GtkWidget *tearoff = gtk_tearoff_menu_item_new(); 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; m_prevRadio = NULL;