From: Robin Dunn Date: Tue, 8 Mar 2005 00:41:35 +0000 (+0000) Subject: Move wxPyCallback back to derive from wxObject X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/43d6e3cae1bd7e8ee457c7d9748db2a54e9d896d 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 f6e653e11d..7a572df572 100644 --- 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 a299f1ea22..c2857c87a0 100644 --- 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;