adapt to wxGLCanvas changes

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

diff --git a/wxPython/src/_evthandler.i b/wxPython/src/_evthandler.i
index 164eb60d41a013355554e0d8c5548efb215175bc..8b39ea8a5ecc4f1182e88777adf766d2a6461b22 100644 (file)
--- 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:
 // wxEvtHandler: the base class for all objects handling wxWindows events
 class wxEvtHandler : public wxObject {
 public:

+    // turn off this typemap
+    %typemap(out) wxEvtHandler*;    
+

     wxEvtHandler();
 
     wxEvtHandler();
 

+    // Turn it back on again
+    %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
+

     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);
     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);


@@ -66,11 +72,11 @@ public:
         }
     }
 
         }
     }
 

+    %pythonAppend _setOORInfo   "args[0].thisown = 0";

     %extend {
     %extend {

-        void _setOORInfo(PyObject* _self) {
+        void _setOORInfo(PyObject* _self, bool incref=true) {

             if (_self && _self != Py_None) {
             if (_self && _self != Py_None) {

-                if (!self->GetClientObject())
-                    self->SetClientObject(new wxPyOORClientData(_self));
+                self->SetClientObject(new wxPyOORClientData(_self, incref));

             }
             else {
                 wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();
             }
             else {
                 wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();


@@ -122,6 +128,9 @@ public:
             return event.Unbind(self, id, id2)              
     }
 
             return event.Unbind(self, id, id2)              
     }
 

+    %property(EvtHandlerEnabled, GetEvtHandlerEnabled, SetEvtHandlerEnabled, doc="See `GetEvtHandlerEnabled` and `SetEvtHandlerEnabled`");
+    %property(NextHandler, GetNextHandler, SetNextHandler, doc="See `GetNextHandler` and `SetNextHandler`");
+    %property(PreviousHandler, GetPreviousHandler, SetPreviousHandler, doc="See `GetPreviousHandler` and `SetPreviousHandler`");

     
 };
 
     
 };