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

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

diff --git a/include/wx/cocoa/menu.h b/include/wx/cocoa/menu.h
index 8a75b3868716122e7a9dd8471e185bc5fc365383..6a834fa9a3cd920bdf291c078030233c7d3ffce2 100644 (file)
--- a/include/wx/cocoa/menu.h
+++ b/include/wx/cocoa/menu.h
@@ -46,9 +46,9 @@ protected:
 // ------------------------------------------------------------------------
 protected:
     // implement base class virtuals
 // ------------------------------------------------------------------------
 protected:
     // implement base class virtuals

-    virtual bool DoAppend(wxMenuItem *item);
-    virtual bool DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem *DoRemove(wxMenuItem *item);
+    virtual wxMenuItem* DoAppend(wxMenuItem *item);
+    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
+    virtual wxMenuItem* DoRemove(wxMenuItem *item);

 
 #if wxUSE_ACCEL
     // add/remove accel for the given menu item
 
 #if wxUSE_ACCEL
     // add/remove accel for the given menu item

diff --git a/src/cocoa/menu.mm b/src/cocoa/menu.mm
index ae88841c860242fce37212cf576bf85ed3a846ad..d8ed61c0a7037cfa2e809129c1e0cd4299ce406b 100644 (file)
--- a/src/cocoa/menu.mm
+++ b/src/cocoa/menu.mm
@@ -53,22 +53,22 @@ wxMenu::~wxMenu()
     [m_cocoaNSMenu release];
 }
 
     [m_cocoaNSMenu release];
 }
 

-bool wxMenu::DoAppend(wxMenuItem *item)
+wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)

 {
     wxAutoNSAutoreleasePool pool;
     if(!wxMenuBase::DoAppend(item))
 {
     wxAutoNSAutoreleasePool pool;
     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;
     if(!wxMenuBase::DoInsert(pos,item))
 {
     wxAutoNSAutoreleasePool pool;
     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)