wxPyCallback needs to derive from wxEvtHandler now since the

wxObjectEventFunction typedef changed.

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

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 5d8e6ca56345140bf21f161ea10d44b30337d023..5af8102b1bf06b1d36de069a3cf5f5a7804d24fd 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -253,7 +253,7 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
 
 #ifndef wxPyUSE_EXPORTED_API
 
-class wxPyCallback : public wxObject {
+class wxPyCallback : public wxEvtHandler {
     DECLARE_ABSTRACT_CLASS(wxPyCallback);
 public:
     wxPyCallback(PyObject* func);

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index d3f1aebbb8df7ea308972242060acdc7076839f9..512b685baaea8d7455bccd396ffb6e1cbb9b147f 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -1477,7 +1477,7 @@ wxFileOffset wxPyCBInputStream::OnSysTell() const {
 
 //----------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
+IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxEvtHandler);
 
 wxPyCallback::wxPyCallback(PyObject* func) {
     m_func = func;