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

wxMenu::Append (and similar) now return a pointer to the wxMenuItem

Browse Source 
that was added.  Checked on MSW, GTK, and Mac, other port authors
please double check changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-23 18:46:05 +00:00
parent 2f3f436922
commit 9add93670b
19 changed files with 181 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk1/menu.cpp
View File

@@ -1358,21 +1358,23 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
return TRUE;
}
bool wxMenu::DoAppend(wxMenuItem *mitem)
wxMenuItem* wxMenu::DoAppend(wxMenuItem *mitem)
{
return GtkAppend(mitem) && wxMenuBase::DoAppend(mitem);
if (!GtkAppend(mitem))
return NULL;
return wxMenuBase::DoAppend(mitem);
}
bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
wxMenuItem* wxMenu::DoInsert(size_t pos, wxMenuItem *item)
{
if ( !wxMenuBase::DoInsert(pos, item) )
return FALSE;
return NULL;
// GTK+ doesn't have a function to insert a menu using GtkItemFactory (as
// of version 1.2.6), so we first append the item and then change its
// index
if ( !GtkAppend(item) )
return FALSE;
return NULL;
if ( m_style & wxMENU_TEAROFF )
{
@@ -1385,7 +1387,7 @@ bool wxMenu::DoInsert(size_t pos, wxMenuItem *item)
menu_shell->children = g_list_remove(menu_shell->children, data);
menu_shell->children = g_list_insert(menu_shell->children, data, pos);
return TRUE;
return item;
}
wxMenuItem *wxMenu::DoRemove(wxMenuItem *item)