X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..8dc6dcde52ed35b51e95db4a62060ade908a623b:/wxPython/src/helpers.h diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index 58c81db3a7..e3432295a6 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -48,6 +48,9 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); PyObject* wxPy_ConvertList(wxListBase* list, const char* className); long wxPyGetWinHandle(wxWindow* win); +void wxPy_ReinitStockObjects(); + + //---------------------------------------------------------------------- // if we want to handle threads and Python threads are available... @@ -191,7 +194,7 @@ protected: class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { DECLARE_ABSTRACT_CLASS(wxPyEvent) public: - wxPyEvent(int id=0); + wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL); wxPyEvent(const wxPyEvent& evt); ~wxPyEvent(); @@ -485,7 +488,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__(CBNAME) \ void CBNAME(); \ - void base_##CBNAME(); + void base_##CBNAME() #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ @@ -506,7 +509,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_INTINT(CBNAME) \ bool CBNAME(int a, int b); \ - bool base_##CBNAME(int a, int b); + bool base_##CBNAME(int a, int b) #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ @@ -526,9 +529,30 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_VOID_(CBNAME) \ + void CBNAME(); \ + void base_##CBNAME() + + +#define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME() { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(); \ + } \ + void CLASS::base_##CBNAME() { \ + PCLASS::CBNAME(); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_INTINT(CBNAME) \ void CBNAME(int a, int b); \ - void base_##CBNAME(int a, int b); + void base_##CBNAME(int a, int b) #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ @@ -547,9 +571,30 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_VOID_INT(CBNAME) \ + void CBNAME(int a); \ + void base_##CBNAME(int a) + + +#define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(int a) { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(int a) { \ + PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_INT4(CBNAME) \ void CBNAME(int a, int b, int c, int d); \ - void base_##CBNAME(int a, int b, int c, int d); + void base_##CBNAME(int a, int b, int c, int d) #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \ @@ -569,7 +614,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_VOID_INT5(CBNAME) \ void CBNAME(int a, int b, int c, int d, int e); \ - void base_##CBNAME(int a, int b, int c, int d, int e); + void base_##CBNAME(int a, int b, int c, int d, int e) #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \ @@ -590,7 +635,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_VOID_INTPINTP_const(CBNAME) \ void CBNAME(int* a, int* b) const; \ - void base_##CBNAME(int* a, int* b) const; + void base_##CBNAME(int* a, int* b) const #define IMP_PYCALLBACK_VOID_INTPINTP_const(CLASS, PCLASS, CBNAME) \ @@ -632,7 +677,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_SIZE_const(CBNAME) \ wxSize CBNAME() const; \ - wxSize base_##CBNAME() const; + wxSize base_##CBNAME() const #define IMP_PYCALLBACK_SIZE_const(CLASS, PCLASS, CBNAME) \ @@ -674,9 +719,31 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_BOOL_BOOL(CBNAME) \ + bool CBNAME(bool a); \ + bool base_##CBNAME(bool a) + + +#define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(bool a) { \ + bool rval=FALSE, found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(bool a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_BOOL_INT(CBNAME) \ bool CBNAME(int a); \ - bool base_##CBNAME(int a); + bool base_##CBNAME(int a) #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ @@ -697,7 +764,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_INT_pure(CBNAME) \ - bool CBNAME(int a); + bool CBNAME(int a) #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ @@ -716,7 +783,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DC(CBNAME) \ void CBNAME(wxDC& a); \ - void base_##CBNAME(wxDC& a); + void base_##CBNAME(wxDC& a) #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ @@ -742,7 +809,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -766,7 +833,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -790,7 +857,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__2DBL(CBNAME) \ void CBNAME(double a, double b); \ - void base_##CBNAME(double a, double b); + void base_##CBNAME(double a, double b) #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ @@ -811,7 +878,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__2DBL2INT(CBNAME) \ void CBNAME(double a, double b, int c, int d); \ - void base_##CBNAME(double a, double b, int c, int d); + void base_##CBNAME(double a, double b, int c, int d) #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -833,7 +900,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME) \ void CBNAME(wxDC& a, double b, double c, double d, double e, bool f); \ - void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f); + void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ @@ -857,7 +924,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_DC4DBLBOOL(CBNAME) \ bool CBNAME(wxDC& a, double b, double c, double d, double e, bool f); \ - bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f); + bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ @@ -883,7 +950,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__BOOL2DBL2INT(CBNAME) \ void CBNAME(bool a, double b, double c, int d, int e); \ - void base_##CBNAME(bool a, double b, double c, int d, int e); + void base_##CBNAME(bool a, double b, double c, int d, int e) #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -905,7 +972,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DC4DBL(CBNAME) \ void CBNAME(wxDC& a, double b, double c, double d, double e); \ - void base_##CBNAME(wxDC& a, double b, double c, double d, double e); + void base_##CBNAME(wxDC& a, double b, double c, double d, double e) #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \ @@ -929,7 +996,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -953,7 +1020,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__WXCPBOOL2DBL2INT(CBNAME) \ void CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f); \ - void base_##CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f); + void base_##CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f) #define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -979,7 +1046,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__WXCP2DBL2INT(CBNAME) \ void CBNAME(wxControlPoint* a, double b, double c, int d, int e); \ - void base_##CBNAME(wxControlPoint* a, double b, double c, int d, int e); + void base_##CBNAME(wxControlPoint* a, double b, double c, int d, int e) #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -1004,7 +1071,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__2DBLINT(CBNAME) \ void CBNAME(double a, double b, int c); \ - void base_##CBNAME(double a, double b, int c); + void base_##CBNAME(double a, double b, int c) #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ @@ -1025,7 +1092,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__BOOL2DBLINT(CBNAME) \ void CBNAME(bool a, double b, double c, int d); \ - void base_##CBNAME(bool a, double b, double c, int d); + void base_##CBNAME(bool a, double b, double c, int d) #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ @@ -1047,7 +1114,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__STRING(CBNAME) \ void CBNAME(const wxString& a); \ - void base_##CBNAME(const wxString& a); + void base_##CBNAME(const wxString& a) #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(const wxString& a) { \ @@ -1070,7 +1137,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_STRING(CBNAME) \ bool CBNAME(const wxString& a); \ - bool base_##CBNAME(const wxString& a); + bool base_##CBNAME(const wxString& a) #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ @@ -1094,7 +1161,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME) \ - bool CBNAME(const wxString& a); + bool CBNAME(const wxString& a) #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ @@ -1112,7 +1179,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_STRING_STRING_pure(CBNAME) \ - wxString CBNAME(const wxString& a); \ + wxString CBNAME(const wxString& a) #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ @@ -1136,7 +1203,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_STRING_STRING(CBNAME) \ wxString CBNAME(const wxString& a); \ - wxString base_##CBNAME(const wxString& a); + wxString base_##CBNAME(const wxString& a) #define IMP_PYCALLBACK_STRING_STRING(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ @@ -1162,7 +1229,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_STRING_STRINGINT_pure(CBNAME) \ - wxString CBNAME(const wxString& a,int b); \ + wxString CBNAME(const wxString& a,int b) #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ @@ -1186,7 +1253,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME) \ bool CBNAME(const wxString& a, const wxString& b); \ - bool base_##CBNAME(const wxString& a, const wxString& b); + bool base_##CBNAME(const wxString& a, const wxString& b) #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ @@ -1213,7 +1280,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_STRING_(CBNAME) \ wxString CBNAME(); \ - wxString base_##CBNAME(); + wxString base_##CBNAME() #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ @@ -1268,7 +1335,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_STRING__pure(CBNAME) \ - wxString CBNAME(); + wxString CBNAME() #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ @@ -1288,8 +1355,29 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_STRING__constpure(CBNAME) \ + wxString CBNAME() const; + +#define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME() const { \ + wxString rval; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + return rval; \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_BOOL_TAG_pure(CBNAME) \ - bool CBNAME(const wxHtmlTag& a); \ + bool CBNAME(const wxHtmlTag& a) #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ @@ -1309,7 +1397,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__CELLINTINT(CBNAME) \ void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y); \ - void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y); + void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ @@ -1333,7 +1421,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__CELLINTINTME(CBNAME) \ void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e); \ - void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e); + void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ @@ -1359,7 +1447,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK___pure(CBNAME) \ - void CBNAME(); \ + void CBNAME() #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ @@ -1373,7 +1461,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_wxSize__pure(CBNAME) \ - wxSize CBNAME(); \ + wxSize CBNAME() #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ @@ -1412,7 +1500,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_WXWIN(CBNAME) \ bool CBNAME(wxWindow* a); \ - bool base_##CBNAME(wxWindow* a); + bool base_##CBNAME(wxWindow* a) #define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ @@ -1436,9 +1524,37 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_BOOL_WXWINDC(CBNAME) \ + bool CBNAME(wxWindow* a, wxDC& b); \ + bool base_##CBNAME(wxWindow* a, wxDC& b) + + +#define IMP_PYCALLBACK_BOOL_WXWINDC(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxWindow* a, wxDC& b) { \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* win = wxPyMake_wxObject(a); \ + PyObject* dc = wxPyMake_wxObject(&b); \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\ + Py_DECREF(win); \ + Py_DECREF(dc); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(a, b); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxWindow* a, wxDC& b) { \ + return PCLASS::CBNAME(a, b); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_WXWINBASE(CBNAME) \ void CBNAME(wxWindowBase* a); \ - void base_##CBNAME(wxWindowBase* a); + void base_##CBNAME(wxWindowBase* a) #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \ @@ -1462,7 +1578,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_(CBNAME) \ bool CBNAME(); \ - bool base_##CBNAME(); + bool base_##CBNAME() #define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ @@ -1485,7 +1601,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_const(CBNAME) \ bool CBNAME() const; \ - bool base_##CBNAME() const; + bool base_##CBNAME() const #define IMP_PYCALLBACK_BOOL_const(CLASS, PCLASS, CBNAME) \ @@ -1508,7 +1624,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_DR_2WXCDR(CBNAME) \ wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); \ - wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def); + wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def) #define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ @@ -1530,7 +1646,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_FSF_FSSTRING_pure(CBNAME) \ - wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location); \ + wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location) #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ @@ -1557,7 +1673,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_DR(CBNAME) \ bool CBNAME(wxDragResult a); \ - bool base_##CBNAME(wxDragResult a); + bool base_##CBNAME(wxDragResult a) #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ @@ -1579,7 +1695,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_DR_2WXCDR_pure(CBNAME) \ - wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); + wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def) #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ @@ -1595,7 +1711,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME) \ - bool CBNAME(int a, int b, const wxString& c); + bool CBNAME(int a, int b, const wxString& c) #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b, const wxString& c) { \ @@ -1614,7 +1730,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_SIZET_(CBNAME) \ size_t CBNAME(); \ - size_t base_##CBNAME(); + size_t base_##CBNAME() #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME) \ @@ -1637,7 +1753,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME) \ wxDataFormat CBNAME(size_t a); \ - wxDataFormat base_##CBNAME(size_t a); + wxDataFormat base_##CBNAME(size_t a) #define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME) \ @@ -1668,7 +1784,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__constany(CBNAME, Type) \ void CBNAME(const Type& a); \ - void base_##CBNAME(const Type& a); + void base_##CBNAME(const Type& a) #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ @@ -1693,7 +1809,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__any(CBNAME, Type) \ void CBNAME(Type& a); \ - void base_##CBNAME(Type& a); + void base_##CBNAME(Type& a) #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ @@ -1717,7 +1833,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_bool_any(CBNAME, Type) \ bool CBNAME(Type& a); \ - bool base_##CBNAME(Type& a); + bool base_##CBNAME(Type& a) #define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ @@ -1742,7 +1858,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_bool_anypure(CBNAME, Type) \ - bool CBNAME(Type& a); + bool CBNAME(Type& a) #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ @@ -1762,7 +1878,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_STRING_LONGLONG(CBNAME) \ wxString CBNAME(long a, long b) const; \ - wxString base_##CBNAME(long a, long b)const ; + wxString base_##CBNAME(long a, long b) const #define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(long a, long b) const { \ @@ -1790,7 +1906,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_INT_LONG(CBNAME) \ int CBNAME(long a) const; \ - int base_##CBNAME(long a)const ; + int base_##CBNAME(long a) const #define IMP_PYCALLBACK_INT_LONG(CLASS, PCLASS, CBNAME) \ @@ -1820,7 +1936,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME) \ wxListItemAttr* CBNAME(long a) const; \ - wxListItemAttr* base_##CBNAME(long a); + wxListItemAttr* base_##CBNAME(long a) const #define IMP_PYCALLBACK_LISTATTR_LONG(CLASS, PCLASS, CBNAME) \ @@ -1843,7 +1959,7 @@ extern wxPyApp *wxPythonApp; rval = PCLASS::CBNAME(a); \ return rval; \ } \ - wxListItemAttr *CLASS::base_##CBNAME(long a) { \ + wxListItemAttr *CLASS::base_##CBNAME(long a) const { \ return PCLASS::CBNAME(a); \ } @@ -1851,7 +1967,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_ME(CBNAME) \ bool CBNAME(wxMouseEvent& e); \ - bool base_##CBNAME(wxMouseEvent& e); + bool base_##CBNAME(wxMouseEvent& e) #define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxMouseEvent& e) { \ @@ -1881,7 +1997,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_WIZPG__pure(CBNAME) \ - wxWizardPage* CBNAME() const; + wxWizardPage* CBNAME() const #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \ wxWizardPage* CLASS::CBNAME() const { \ @@ -1902,7 +2018,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BITMAP__pure(CBNAME) \ - wxBitmap CBNAME() const; + wxBitmap CBNAME() const #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \ wxBitmap CLASS::CBNAME() const { \ @@ -1925,7 +2041,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_OBJECT__pure(CBNAME) \ - wxObject* CBNAME(); + wxObject* CBNAME() #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME() { \ @@ -1946,7 +2062,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_OBJECT_STRING_pure(CBNAME) \ - wxObject* CBNAME(const wxString& a); + wxObject* CBNAME(const wxString& a) #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME(const wxString& a) { \ @@ -1969,7 +2085,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_NODE_pure(CBNAME) \ - bool CBNAME(wxXmlNode* a); + bool CBNAME(wxXmlNode* a) #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \