X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04633c190f5a6eafe607a5712647aaa131522b1f..2a783b2daaae6f06928e7095ebbc4fc039583907:/wxPython/src/_evthandler.i?ds=sidebyside

diff --git a/wxPython/src/_evthandler.i b/wxPython/src/_evthandler.i
index 915d659f4d..8820696dcf 100644
--- a/wxPython/src/_evthandler.i
+++ b/wxPython/src/_evthandler.i
@@ -19,8 +19,15 @@
 // wxEvtHandler: the base class for all objects handling wxWindows events
 class wxEvtHandler : public wxObject {
 public:
+    // turn off this typemap
+    %typemap(out) wxEvtHandler*;    
+
+    %pythonAppend wxEvtHandler         "self._setOORInfo(self)"
     wxEvtHandler();
 
+    // Turn it back on again
+    %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
+
     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);
@@ -39,6 +46,11 @@ public:
     // process all pending events
     void ProcessPendingEvents();
 
+    // reentrance guard
+    void AllowReentrance( bool allow = true );
+    bool IsReentranceAllowed();
+    bool IsEventHandlingInProgress();
+
     %extend {
         // Dynamic association of a member function handler with the event handler
         void Connect( int id, int lastId, int eventType, PyObject* func) {
@@ -66,10 +78,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();
@@ -121,6 +134,9 @@ public:
             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`");
     
 };