Disown using .this.own(False) instead of .thisown = False

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_app_ex.py b/wxPython/src/_app_ex.py
index fc84315a099fb9b3de95b15ce0805355e9766fb8..f6f7a5ac3e657b61940a05a108d4fadaee24021f 100644 (file)
--- a/wxPython/src/_app_ex.py
+++ b/wxPython/src/_app_ex.py
@@ -191,8 +191,8 @@ in on the main display of your Mac."""
         destroy(self)
 
     def Destroy(self):
+        self.this.own(False)
         wx.PyApp.Destroy(self)
-        self.thisown = 0
 
     def SetTopWindow(self, frame):
         """Set the \"main\" top level window"""

diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i
index e0acf440158b335c90fc4177ffd21cdd9e104a3b..3e1444579d1fbb8dc8ae4a0bfbaa2f8cfa76500c 100644 (file)
--- a/wxPython/src/_artprov.i
+++ b/wxPython/src/_artprov.i
@@ -299,7 +299,7 @@ topmost provider if platform_dependent = false", "");
     
     
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; }}
 };
 

diff --git a/wxPython/src/_cshelp.i b/wxPython/src/_cshelp.i
index 2e4b493f65b410a5a74e45a4634efd8341858a75..91b1d230e25cec2b3a3ced8ff1f274be0bd8ed68 100644 (file)
--- a/wxPython/src/_cshelp.i
+++ b/wxPython/src/_cshelp.i
@@ -285,7 +285,7 @@ table of help strings will fill up and when window pointers are
 reused, the wrong help string will be found.", "");
     
     
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; } }
 };
 

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index d53789b681e6d4192c9492c260c17d0fa5a8f361..ce1701e47ae378ecd9a0052ebe7ab42081219ba7 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -174,7 +174,7 @@ public:
 
     void AssignFrom(const wxListItemAttr& source);
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; } }
 
     %property(BackgroundColour, GetBackgroundColour, SetBackgroundColour, doc="See `GetBackgroundColour` and `SetBackgroundColour`");

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index f02fdb84677147e331ff6f212e25f38fe9e1ba24..48fd12b62b1f443616f453fb40df0bb828b28eaf 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -159,7 +159,7 @@ public:
         }
     }
 
-    %pythonAppend Destroy "args[0].thisown = 0";
+    %pythonPrepend Destroy "args[0].this.own(False)";
     %extend { void Destroy() { delete self; } }
 };
 

diff --git a/wxPython/src/_menu.i b/wxPython/src/_menu.i
index 50a3f6e7fcd3a9b643c9f9e620ecfd8cb9fcb916..070d88a40777735e825e45b292ec01ac5da4d137 100644 (file)
--- a/wxPython/src/_menu.i
+++ b/wxPython/src/_menu.i
@@ -140,12 +140,20 @@ public:
     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)
-    %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

diff --git a/wxPython/src/_misc.i b/wxPython/src/_misc.i
index 2330298d19e9809e3525019c0b4eb76a14b9f000..c412e3026f3da2aced4e4a1165415bd52c4200d4 100644 (file)
--- a/wxPython/src/_misc.i
+++ b/wxPython/src/_misc.i
@@ -54,7 +54,7 @@ public:
     ~wxCaret(); 
 
     %extend {
-        %pythonAppend Destroy "args[0].thisown = 0"
+        %pythonPrepend Destroy "args[0].this.own(False)"
         DocStr(Destroy,
                "Deletes the C++ object this Python object is a proxy for.", "");
         void Destroy() {

diff --git a/wxPython/src/_obj.i b/wxPython/src/_obj.i
index 52620e7726cbbbf34edefe40d6ac3fae1e87e563..56672a69b71eafe7d1e53f6a148e2a68ea189a83 100644 (file)
--- a/wxPython/src/_obj.i
+++ b/wxPython/src/_obj.i
@@ -30,7 +30,7 @@ public:
             return self->GetClassInfo()->GetClassName();
         }
 
-        %pythonAppend Destroy "args[0].thisown = 0"
+        %pythonPrepend Destroy "args[0].this.own(False)"
         DocStr(Destroy,
                "Deletes the C++ object this Python object is a proxy for.", "");
         void Destroy() {

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index abdc2c65396c9240ccbd5b0ea6b11a525450d198..9ae6d122506717ea14e36475c0d18a2f4aca5ac6 100644 (file)
--- a/wxPython/src/_taskbar.i
+++ b/wxPython/src/_taskbar.i
@@ -108,7 +108,7 @@ public:
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref);
 
-    %pythonAppend Destroy "args[0].thisown = 0";
+    %pythonPrepend Destroy "args[0].this.own(False)";
     %extend {
         void Destroy() {
             self->RemoveIcon();

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index e87e7ba7b3d1eea19c380a59bfae1cb397ba318a..adcac9458b84e02c7edd4a2c1f41209c75359c54 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -132,7 +132,7 @@ public:
     const wxTreeItemId& GetId();
     void                SetId(const wxTreeItemId& id);
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; } }
 
     %property(Data, GetData, SetData, doc="See `GetData` and `SetData`");

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index fd0e6c0db7ffe84f37dcfb0194e5b4f3d24ea797..b59bf49633d45b2cf5e8b56fc7a6ff544afd57eb 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -259,7 +259,7 @@ instead.");
     
 
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     DocDeclStr(
         virtual bool , Destroy(),
         "Destroys the window safely.  Frames and dialogs are not destroyed

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 00fee52e13323b262c4aeb38543f4427df7f051d..69b0c9b4a65e3bcd3fa1ba6fe68163c2f2a8e1a2 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -750,7 +750,7 @@ public:
     virtual void StartingClick();
     virtual void HandleReturn(wxKeyEvent& event);
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     virtual void Destroy();
 
     %property(CellAttr, GetCellAttr, SetCellAttr, doc="See `GetCellAttr` and `SetCellAttr`");
@@ -1345,7 +1345,7 @@ public:
     wxPyGridTableBase();
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-    %pythonAppend Destroy "args[0].thisown = 0"
+    %pythonPrepend Destroy "args[0].this.own(False)"
     %extend { void Destroy() { delete self; } }
 
     wxString GetTypeName( int row, int col );