X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04633c190f5a6eafe607a5712647aaa131522b1f..777dffec694eae7231e4133e5dc6bbca78045f29:/wxPython/src/_evthandler.i

diff --git a/wxPython/src/_evthandler.i b/wxPython/src/_evthandler.i
index 915d659f4d..5df2f19381 100644
--- a/wxPython/src/_evthandler.i
+++ b/wxPython/src/_evthandler.i
@@ -19,8 +19,14 @@
 // wxEvtHandler: the base class for all objects handling wxWindows events
 class wxEvtHandler : public wxObject {
 public:
+    // turn off this typemap
+    %typemap(out) wxEvtHandler*;    
+
     wxEvtHandler();
 
+    // Turn it back on again
+    %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
+
     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);
@@ -66,10 +72,11 @@ public:
         }
     }
 
+    %pythonAppend _setOORInfo   "args[0].thisown = 0";
     %extend {
-        void _setOORInfo(PyObject* _self) {
+        void _setOORInfo(PyObject* _self, bool incref=true) {
             if (_self && _self != Py_None) {
-                self->SetClientObject(new wxPyOORClientData(_self));
+                self->SetClientObject(new wxPyOORClientData(_self, incref));
             }
             else {
                 wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();