Move wxPyCallback back to derive from wxObject

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

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index f6e653e11d1dd353ce014f7618692ac3c744c5f9..7a572df5724a3f4175618fb8f308409c64c5aea2 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 wxEvtHandler {
+class wxPyCallback : public wxObject {
     DECLARE_ABSTRACT_CLASS(wxPyCallback);
 public:
     wxPyCallback(PyObject* func);

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