Passing None to an EVT_* function will Disconnect

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

diff --git a/wxPython/src/msw/windows.cpp b/wxPython/src/msw/windows.cpp
index e84c9a3f50580a43fe46efd65880e77214891011..63dd54c338039e635ffd2bf964947c9b09367537 100644 (file)
--- a/wxPython/src/msw/windows.cpp
+++ b/wxPython/src/msw/windows.cpp
@@ -472,6 +472,14 @@ static void  wxEvtHandler_Connect(wxEvtHandler *self,int  id,int  lastId,int  ev
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }

+            else if (func == Py_None) {
+                self->Disconnect(id, lastId, eventType,
+                                 (wxObjectEventFunction)
+                                 &wxPyCallback::EventThunker);
+            }
+            else {
+                PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+            }

         }
 static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
         }
 static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

diff --git a/wxPython/src/windows.i b/wxPython/src/windows.i
index 0da45474bcac968d8a67e708456f6f70ca316523..53d137d72bc0bdeef3f5178d3848538eaa8674ef 100644 (file)
--- a/wxPython/src/windows.i
+++ b/wxPython/src/windows.i
@@ -63,6 +63,14 @@ public:
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }
                           (wxObjectEventFunction) &wxPyCallback::EventThunker,
                           new wxPyCallback(func));
             }

+            else if (func == Py_None) {
+                self->Disconnect(id, lastId, eventType,
+                                 (wxObjectEventFunction)
+                                 &wxPyCallback::EventThunker);
+            }
+            else {
+                PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+            }

         }
 
         bool Disconnect(int id, int lastId = -1,
         }
 
         bool Disconnect(int id, int lastId = -1,