reswigged

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

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index d1122ce95a2116a8b1e78fa07f1742f0bec4f676..c19a3048623ca14d70272eba224649db959ac912 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -133,19 +133,38 @@ public:
     // deleting it!)
     %newobject Remove;
     wxMenuItem *Remove(int id);
     // deleting it!)
     %newobject Remove;
     wxMenuItem *Remove(int id);

-    %Rename(RemoveItem,  wxMenuItem*, Remove(wxMenuItem *item));

 
 

+    %feature("shadow") Remove(wxMenuItem *item) %{
+        def RemoveItem(self, item):
+            """RemoveItem(self, MenuItem item) -> MenuItem"""
+            #// The return object is always the parameter, so return that 
+            #// proxy instead of the new one
+            val = _core_.Menu_RemoveItem(self, item)
+            item.this.own(val.this.own())
+            val.this.disown()
+            return item
+    %}
+    %Rename(RemoveItem,  wxMenuItem*, Remove(wxMenuItem *item));
+    

     // delete an item from the menu (submenus are not destroyed by this
     // function, see Destroy)
     bool Delete(int id);
     %Rename(DeleteItem,  bool, Delete(wxMenuItem *item));
 
     // delete an item from the menu (submenus are not destroyed by this
     // function, see Destroy)
     bool Delete(int id);
     %Rename(DeleteItem,  bool, Delete(wxMenuItem *item));
 

-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"

     %extend { void Destroy() { delete self; } }
     
     // delete the item from menu and destroy it (if it's a submenu)
     %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));
+    %pythonPrepend Destroy "";
+    DocDeclStrName(
+        bool , Destroy(int id),
+        "", "",
+        DestroyId);
+    
+    DocDeclStrName(
+        bool , Destroy(wxMenuItem *item),
+        "", "",
+        DestroyItem);

 
 
     // get the items
 
 
     // get the items


@@ -214,6 +233,17 @@ public:
     // set/get the parent of this menu
     void SetParent(wxMenu *parent);
     wxMenu *GetParent() const;
     // set/get the parent of this menu
     void SetParent(wxMenu *parent);
     wxMenu *GetParent() const;

+
+    %property(EventHandler, GetEventHandler, SetEventHandler, doc="See `GetEventHandler` and `SetEventHandler`");
+    %property(HelpString, GetHelpString, SetHelpString, doc="See `GetHelpString` and `SetHelpString`");
+    %property(InvokingWindow, GetInvokingWindow, SetInvokingWindow, doc="See `GetInvokingWindow` and `SetInvokingWindow`");
+    %property(MenuBar, GetMenuBar, doc="See `GetMenuBar`");
+    %property(MenuItemCount, GetMenuItemCount, doc="See `GetMenuItemCount`");
+    %property(MenuItems, GetMenuItems, doc="See `GetMenuItems`");
+    %property(Parent, GetParent, SetParent, doc="See `GetParent` and `SetParent`");
+    %property(Style, GetStyle, doc="See `GetStyle`");
+    %property(Title, GetTitle, SetTitle, doc="See `GetTitle` and `SetTitle`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -335,8 +365,11 @@ public:
             for m, l in items:
                 self.Append(m, l)
     }
             for m, l in items:
                 self.Append(m, l)
     }

-    %property(Menus, GetMenus, SetMenus);

     
     

+    %property(Frame, GetFrame, doc="See `GetFrame`");
+    %property(Menu, GetMenu, doc="See `GetMenu`");
+    %property(MenuCount, GetMenuCount, doc="See `GetMenuCount`");
+    %property(Menus, GetMenus, SetMenus, doc="See `GetMenus` and `SetMenus`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -344,13 +377,23 @@ public:
 
 class wxMenuItem : public wxObject {
 public:
 
 class wxMenuItem : public wxObject {
 public:

-    wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY,
+    // turn off this typemap
+    %typemap(out) wxMenuItem*;    
+
+    wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,

                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
     ~wxMenuItem();
 
                const wxString& text = wxPyEmptyString,
                const wxString& help = wxPyEmptyString,
                wxItemKind kind = wxITEM_NORMAL,
                wxMenu* subMenu = NULL);
     ~wxMenuItem();
 

+    // Turn it back on again
+    %typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, $owner); }
+
+    // Make Destroy a NOP.  The destruction will be handled by SWIG.
+    %pythoncode { def Destroy(self): pass }
+
+    

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


@@ -452,6 +495,22 @@ public:
         void ResetOwnerDrawn() {}
     }
 #endif
         void ResetOwnerDrawn() {}
     }
 #endif

+
+    %property(Accel, GetAccel, SetAccel, doc="See `GetAccel` and `SetAccel`");
+    %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`");
+    %property(Bitmap, GetBitmap, SetBitmap, doc="See `GetBitmap` and `SetBitmap`");
+    %property(DisabledBitmap, GetDisabledBitmap, SetDisabledBitmap, doc="See `GetDisabledBitmap` and `SetDisabledBitmap`");
+    %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");
+    %property(Help, GetHelp, SetHelp, doc="See `GetHelp` and `SetHelp`");
+    %property(Id, GetId, SetId, doc="See `GetId` and `SetId`");
+    %property(Kind, GetKind, SetKind, doc="See `GetKind` and `SetKind`");
+    %property(Label, GetLabel, doc="See `GetLabel`");
+    %property(MarginWidth, GetMarginWidth, SetMarginWidth, doc="See `GetMarginWidth` and `SetMarginWidth`");
+    %property(Menu, GetMenu, SetMenu, doc="See `GetMenu` and `SetMenu`");
+    %property(SubMenu, GetSubMenu, SetSubMenu, doc="See `GetSubMenu` and `SetSubMenu`");
+    %property(Text, GetText, SetText, doc="See `GetText` and `SetText`");
+    %property(TextColour, GetTextColour, SetTextColour, doc="See `GetTextColour` and `SetTextColour`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------