cleanup - reformatting

[wxWidgets.git] / wxPython / src / _menu.i

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index 3ab240329107e56b92e94894995963d78bf5a1a4..2dbc925ea550902c1935effeed47098530e14a94 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -55,16 +55,21 @@ public:
                                            wxMenu *submenu,
                                            const wxString& help = wxPyEmptyString));
 
                                            wxMenu *submenu,
                                            const wxString& help = wxPyEmptyString));
 

+
+    %disownarg(wxMenuItem*);

     // the most generic form of Append() - append anything
     %Rename(AppendItem, wxMenuItem*, Append(wxMenuItem *item));
     // the most generic form of Append() - append anything
     %Rename(AppendItem, wxMenuItem*, Append(wxMenuItem *item));

+    // insert an item before given position
+    %Rename(InsertItem, wxMenuItem*, Insert(size_t pos, wxMenuItem *item));
+    // prepend an item to the menu
+    %Rename(PrependItem,  wxMenuItem*, Prepend(wxMenuItem *item));
+    %cleardisown(wxMenuItem*);
+

 
     // insert a break in the menu (only works when appending the items, not
     // inserting them)
     virtual void Break();
 
 
     // insert a break in the menu (only works when appending the items, not
     // inserting them)
     virtual void Break();
 

-    // insert an item before given position
-    %Rename(InsertItem, wxMenuItem*, Insert(size_t pos, wxMenuItem *item));
-

     // insert an item before given position
     wxMenuItem* Insert(size_t pos,
                        int id,
     // insert an item before given position
     wxMenuItem* Insert(size_t pos,
                        int id,


@@ -94,9 +99,6 @@ public:
                                          wxMenu *submenu,
                                          const wxString& help = wxPyEmptyString));
 
                                          wxMenu *submenu,
                                          const wxString& help = wxPyEmptyString));
 

-    // prepend an item to the menu
-    %Rename(PrependItem,  wxMenuItem*, Prepend(wxMenuItem *item));
-

     // prepend any item to the menu
     wxMenuItem* Prepend(int id,
                         const wxString& text,
     // prepend any item to the menu
     wxMenuItem* Prepend(int id,
                         const wxString& text,


@@ -122,9 +124,11 @@ public:
                                            wxMenu *submenu,
                                            const wxString& help = wxPyEmptyString));
 
                                            wxMenu *submenu,
                                            const wxString& help = wxPyEmptyString));
 

+    

     // detach an item from the menu, but don't delete it so that it can be
     // added back later (but if it's not, the caller is responsible for
     // deleting it!)
     // detach an item from the menu, but don't delete it so that it can be
     // added back later (but if it's not, the caller is responsible for
     // deleting it!)

+    %newobject Remove;

     wxMenuItem *Remove(int id);
     %Rename(RemoveItem,  wxMenuItem*, Remove(wxMenuItem *item));
 
     wxMenuItem *Remove(int id);
     %Rename(RemoveItem,  wxMenuItem*, Remove(wxMenuItem *item));
 


@@ -133,8 +137,10 @@ public:
     bool Delete(int id);
     %Rename(DeleteItem,  bool, Delete(wxMenuItem *item));
 
     bool Delete(int id);
     %Rename(DeleteItem,  bool, Delete(wxMenuItem *item));
 

-    // delete the item from menu and destroy it (if it's a submenu)
+    %pythonAppend Destroy "args[0].thisown = 0"

     %extend { void Destroy() { delete self; } }
     %extend { void Destroy() { delete self; } }

+    
+    // delete the item from menu and destroy it (if it's a submenu)

     %Rename(DestroyId,  bool, Destroy(int id));
     %Rename(DestroyItem,  bool, Destroy(wxMenuItem *item));
 
     %Rename(DestroyId,  bool, Destroy(int id));
     %Rename(DestroyItem,  bool, Destroy(wxMenuItem *item));
 


@@ -321,6 +327,7 @@ public:
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);

+    ~wxMenuItem();

 
     // the menu we're in
     wxMenu *GetMenu() const;
 
     // the menu we're in
     wxMenu *GetMenu() const;