diff --git a/wxPython/contrib/ogl/oglhelpers.h b/wxPython/contrib/ogl/oglhelpers.h index 010e72e0a0..d5c9281858 100644 --- a/wxPython/contrib/ogl/oglhelpers.h +++ b/wxPython/contrib/ogl/oglhelpers.h @@ -54,8 +54,7 @@ DEC_PYCALLBACK__WXCP2DBL2INT (OnSizingEndDragLeft); \ DEC_PYCALLBACK__2DBL (OnBeginSize); \ DEC_PYCALLBACK__2DBL (OnEndSize); \ - \ - PYPRIVATE; + PYPRIVATE #define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT) \ @@ -87,7 +86,7 @@ IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingBeginDragLeft);\ IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingEndDragLeft); \ IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnBeginSize); \ - IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnEndSize); \ + IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnEndSize) // This one may be difficult... diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index e4ad7e4b7c..0af64a78c1 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -485,7 +485,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK__(CBNAME) \ void CBNAME(); \ - void base_##CBNAME(); + void base_##CBNAME() #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ @@ -506,7 +506,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) \ @@ -528,7 +528,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_VOID_(CBNAME) \ void CBNAME(); \ - void base_##CBNAME(); + void base_##CBNAME() #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \ @@ -549,7 +549,7 @@ extern wxPyApp *wxPythonApp; #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) \ @@ -570,7 +570,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_VOID_INT(CBNAME) \ void CBNAME(int a); \ - void base_##CBNAME(int a); + void base_##CBNAME(int a) #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ @@ -591,7 +591,7 @@ extern wxPyApp *wxPythonApp; #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) \ @@ -611,7 +611,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) \ @@ -632,7 +632,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) \ @@ -674,7 +674,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) \ @@ -718,7 +718,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_BOOL(CBNAME) \ bool CBNAME(bool a); \ - bool base_##CBNAME(bool a); + bool base_##CBNAME(bool a) #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ @@ -740,7 +740,7 @@ extern wxPyApp *wxPythonApp; #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) \ @@ -761,7 +761,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) \ @@ -780,7 +780,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) \ @@ -806,7 +806,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) \ @@ -830,7 +830,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) \ @@ -854,7 +854,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) \ @@ -875,7 +875,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) \ @@ -897,7 +897,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) \ @@ -921,7 +921,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) \ @@ -947,7 +947,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) \ @@ -969,7 +969,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) \ @@ -993,7 +993,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) \ @@ -1017,7 +1017,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) \ @@ -1043,7 +1043,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) \ @@ -1068,7 +1068,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) \ @@ -1089,7 +1089,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) \ @@ -1111,7 +1111,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) { \ @@ -1134,7 +1134,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) { \ @@ -1158,7 +1158,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) { \ @@ -1176,7 +1176,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) { \ @@ -1200,7 +1200,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) { \ @@ -1226,7 +1226,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) { \ @@ -1250,7 +1250,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) { \ @@ -1277,7 +1277,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() { \ @@ -1304,7 +1304,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() { \ @@ -1325,7 +1325,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #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) \ @@ -1345,7 +1345,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) { \ @@ -1369,7 +1369,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) { \ @@ -1395,7 +1395,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK___pure(CBNAME) \ - void CBNAME(); \ + void CBNAME() #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ @@ -1409,7 +1409,7 @@ extern wxPyApp *wxPythonApp; //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_wxSize__pure(CBNAME) \ - wxSize CBNAME(); \ + wxSize CBNAME() #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ @@ -1448,7 +1448,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) \ @@ -1474,7 +1474,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_WXWINDC(CBNAME) \ bool CBNAME(wxWindow* a, wxDC& b); \ - bool base_##CBNAME(wxWindow* a, wxDC& b); + bool base_##CBNAME(wxWindow* a, wxDC& b) #define IMP_PYCALLBACK_BOOL_WXWINDC(CLASS, PCLASS, CBNAME) \ @@ -1502,7 +1502,7 @@ extern wxPyApp *wxPythonApp; #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) \ @@ -1526,7 +1526,7 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_BOOL_(CBNAME) \ bool CBNAME(); \ - bool base_##CBNAME(); + bool base_##CBNAME() #define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ @@ -1549,7 +1549,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) \ @@ -1572,7 +1572,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) \ @@ -1594,7 +1594,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) { \ @@ -1621,7 +1621,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) \ @@ -1643,7 +1643,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) \ @@ -1659,7 +1659,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) { \ @@ -1678,7 +1678,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) \ @@ -1701,7 +1701,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) \ @@ -1732,7 +1732,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) \ @@ -1757,7 +1757,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) \ @@ -1781,7 +1781,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) \ @@ -1806,7 +1806,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) \ @@ -1826,7 +1826,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 { \ @@ -1854,7 +1854,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) \ @@ -1884,7 +1884,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) \ @@ -1907,7 +1907,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); \ } @@ -1915,7 +1915,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) { \ @@ -1945,7 +1945,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 { \ @@ -1966,7 +1966,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 { \ @@ -1989,7 +1989,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() { \ @@ -2010,7 +2010,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) { \ @@ -2033,7 +2033,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) \