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@25343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-23 21:02:06 +00:00
parent 1ba7e7b79f
commit fe4a107dda
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/cocoa/menu.h
View File

@@ -46,8 +46,8 @@ protected:
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
protected: protected:
// implement base class virtuals // implement base class virtuals
virtual bool DoAppend(wxMenuItem *item); virtual wxMenuItem* DoAppend(wxMenuItem *item);
virtual bool DoInsert(size_t pos, wxMenuItem *item); virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
virtual wxMenuItem* DoRemove(wxMenuItem *item); virtual wxMenuItem* DoRemove(wxMenuItem *item);
#if wxUSE_ACCEL #if wxUSE_ACCEL

12
src/cocoa/menu.mm
View File

@@ -53,22 +53,22 @@ wxMenu::~wxMenu()
[m_cocoaNSMenu release]; [m_cocoaNSMenu release];
} }
bool wxMenu::DoAppend(wxMenuItem *item) wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
{ {
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
if(!wxMenuBase::DoAppend(item)) if(!wxMenuBase::DoAppend(item))
return false; return NULL;
[m_cocoaNSMenu addItem: item->GetNSMenuItem()]; [m_cocoaNSMenu addItem: item->GetNSMenuItem()];
return true; return item;
} }
bool wxMenu::DoInsert(unsigned long pos, wxMenuItem *item) wxMenuItem* wxMenu::DoInsert(unsigned long pos, wxMenuItem *item)
{ {
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
if(!wxMenuBase::DoInsert(pos,item)) if(!wxMenuBase::DoInsert(pos,item))
return false; return NULL;
[m_cocoaNSMenu insertItem:item->GetNSMenuItem() atIndex:pos]; [m_cocoaNSMenu insertItem:item->GetNSMenuItem() atIndex:pos];
return true; return item;
} }
wxMenuItem* wxMenu::DoRemove(wxMenuItem *item) wxMenuItem* wxMenu::DoRemove(wxMenuItem *item)