ActiveX events should be sent to the window, not it's parent.

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

diff --git a/wxPython/src/_evthandler.i b/wxPython/src/_evthandler.i
index 1d3f53ceb980a724bb556d85f57eeef4780c292f..2fed5cab97515c1a902c6e3ff1df36153730635e 100644 (file)
--- a/wxPython/src/_evthandler.i
+++ b/wxPython/src/_evthandler.i
@@ -53,7 +53,8 @@ public:
                                  &wxPyCallback::EventThunker);
             }
             else {
-                PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+                wxPyBLOCK_THREADS(
+                    PyErr_SetString(PyExc_TypeError, "Expected callable object or None."));
             }
         }
 
@@ -105,6 +106,14 @@ public:
                 id  = source.GetId()
             event.Bind(self, id, id2, handler)              
 
+        def Unbind(self, event, source=None, id=wx.ID_ANY, id2=wx.ID_ANY):
+            """
+            Disconencts the event handler binding for event from self.
+            Returns True if successful.
+            """
+            if source is not None:
+                id  = source.GetId()
+            return event.Unbind(self, id, id2)              
     }