From 475f0bf8141c89dce77a1e5541dc6ddb357dbcb0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 14 Apr 2004 05:52:18 +0000 Subject: [PATCH] whitespace cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/include/wx/wxPython/wxPython_int.h | 428 ++++++++++---------- 1 file changed, 214 insertions(+), 214 deletions(-) diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h index 86626a626c..855861601a 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -637,10 +637,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -658,10 +658,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b) { \ bool rval=False, found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -680,10 +680,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -701,10 +701,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -722,10 +722,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -743,10 +743,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b, int c, int d) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c,d); \ } \ @@ -763,10 +763,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b, int c, int d, int e) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c,d,e); \ } \ @@ -785,7 +785,7 @@ extern wxPyApp *wxPythonApp; void CLASS::CBNAME(int* a, int* b) const { \ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -827,7 +827,7 @@ extern wxPyApp *wxPythonApp; wxSize CLASS::CBNAME() const { \ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \ bool found; wxSize rval(0,0); \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -849,7 +849,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(); \ else \ @@ -870,10 +870,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(bool a) { \ bool rval=False, found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -892,10 +892,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ bool rval=False, found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -910,15 +910,15 @@ extern wxPyApp *wxPythonApp; bool CBNAME(int a) -#define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME(int a) { \ - bool rval=False; \ - bool blocked = wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ - else rval = False; \ - wxPyEndBlockThreads(blocked); \ - return rval; \ +#define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(int a) { \ + bool rval=False; \ + bool blocked = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ + else rval = False; \ + wxPyEndBlockThreads(blocked); \ + return rval; \ } @@ -932,13 +932,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -958,13 +958,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -982,13 +982,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1006,10 +1006,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1027,11 +1027,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c, int d) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ a,b,c,d)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d); \ } \ @@ -1049,13 +1049,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ } \ @@ -1073,14 +1073,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ bool rval=False; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));\ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b, c, d, e, f); \ return rval; \ @@ -1099,11 +1099,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d, int e) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \ (int)a,b,c,d,e)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1121,13 +1121,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1145,13 +1145,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1170,13 +1170,13 @@ extern wxPyApp *wxPythonApp; void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \ int e, int f) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ } \ @@ -1195,13 +1195,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1220,10 +1220,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c); \ } \ @@ -1241,10 +1241,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d); \ } \ @@ -1262,13 +1262,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(const wxString& a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1286,13 +1286,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(const wxString& a) { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s = wx2PyString(a); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1309,13 +1309,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ bool rval=False; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* s = wx2PyString(a); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1327,7 +1327,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1338,7 +1338,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1352,7 +1352,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1365,7 +1365,7 @@ extern wxPyApp *wxPythonApp; } \ if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1377,7 +1377,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ wxString rval; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1388,7 +1388,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1402,7 +1402,7 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s1 = wx2PyString(a); \ PyObject* s2 = wx2PyString(b); \ @@ -1410,7 +1410,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(s1); \ Py_DECREF(s2); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1429,7 +1429,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME() { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1438,7 +1438,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1457,7 +1457,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME() const { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1466,7 +1466,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1483,7 +1483,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1492,7 +1492,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1504,7 +1504,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() const { \ wxString rval; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1513,7 +1513,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1526,13 +1526,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ bool rval=False; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0);\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1545,13 +1545,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(cell, x, y); \ } \ @@ -1588,23 +1588,23 @@ extern wxPyApp *wxPythonApp; void 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) { \ - bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ - if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ - PyObject* o2 = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ - wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2)); \ - Py_DECREF(obj); \ - Py_DECREF(o2); \ - } \ - wxPyEndBlockThreads(blocked); \ - if (! found) \ - PCLASS::CBNAME(cell, x, y, e); \ - } \ - void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ - PCLASS::CBNAME(cell, x, y, e); \ +#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ + bool found; \ + bool blocked = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ + PyObject* o2 = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ + wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2)); \ + Py_DECREF(obj); \ + Py_DECREF(o2); \ + } \ + wxPyEndBlockThreads(blocked); \ + if (! found) \ + PCLASS::CBNAME(cell, x, y, e); \ + } \ + void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) {\ + PCLASS::CBNAME(cell, x, y, e); \ } @@ -1617,10 +1617,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ } //--------------------------------------------------------------------------- @@ -1633,7 +1633,7 @@ extern wxPyApp *wxPythonApp; wxSize CLASS::CBNAME() { \ const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \ wxSize rval(0,0); \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxSize* ptr; \ @@ -1657,7 +1657,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1672,13 +1672,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(wxWindow* a) { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(a); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1694,11 +1694,11 @@ extern wxPyApp *wxPythonApp; bool base_##CBNAME(wxWindow* a, wxDC& b) -#define IMP_PYCALLBACK_BOOL_WXWINDC(CLASS, PCLASS, CBNAME) \ +#define IMP_PYCALLBACK_BOOL_WXWINDC(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxWindow* a, wxDC& b) { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* win = wxPyMake_wxObject(a); \ PyObject* dc = wxPyMake_wxObject(&b); \ @@ -1706,7 +1706,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(win); \ Py_DECREF(dc); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1725,13 +1725,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxWindowBase* a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1750,10 +1750,10 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME() { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1773,10 +1773,10 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME() const { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1796,10 +1796,10 @@ extern wxPyApp *wxPythonApp; wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ int rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b, c); \ return (wxDragResult)rval; \ @@ -1813,25 +1813,25 @@ extern wxPyApp *wxPythonApp; #define DEC_PYCALLBACK_FSF_FSSTRING_pure(CBNAME) \ wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location) -#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ - wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ - bool blocked = wxPyBeginBlockThreads(); \ - wxFSFile* rval=0; \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* ro; \ - PyObject* obj = wxPyMake_wxObject(&a); \ - PyObject* s = wx2PyString(b); \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\ - obj, s)); \ - if (ro) { \ - wxPyConvertSwigPtr(ro, (void **)&rval, wxT("wxFSFILE"));\ - Py_DECREF(ro); \ - } \ - Py_DECREF(obj); \ - Py_DECREF(s); \ - } \ - wxPyEndBlockThreads(blocked); \ - return rval; \ +#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ + wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ + bool blocked = wxPyBeginBlockThreads(); \ + wxFSFile* rval=0; \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + PyObject* ro; \ + PyObject* obj = wxPyMake_wxObject(&a); \ + PyObject* s = wx2PyString(b); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)", \ + obj, s)); \ + if (ro) { \ + wxPyConvertSwigPtr(ro, (void **)&rval, wxT("wxFSFILE")); \ + Py_DECREF(ro); \ + } \ + Py_DECREF(obj); \ + Py_DECREF(s); \ + } \ + wxPyEndBlockThreads(blocked); \ + return rval; \ }; //--------------------------------------------------------------------------- @@ -1841,20 +1841,20 @@ extern wxPyApp *wxPythonApp; bool base_##CBNAME(wxDragResult a) -#define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME(wxDragResult a) { \ - bool rval=False; \ - bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ - if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\ - wxPyEndBlockThreads(blocked); \ - if (! found) \ - rval = PCLASS::CBNAME(a); \ - return rval; \ - } \ - bool CLASS::base_##CBNAME(wxDragResult a) { \ - return PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxDragResult a) { \ + bool rval=False; \ + bool found; \ + bool blocked = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ + wxPyEndBlockThreads(blocked); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxDragResult a) { \ + return PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -1863,15 +1863,15 @@ extern wxPyApp *wxPythonApp; wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def) -#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ - wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ - bool blocked = wxPyBeginBlockThreads(); \ - int rval=0; \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ +#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ + wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + bool blocked = wxPyBeginBlockThreads(); \ + int rval=0; \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ - wxPyEndBlockThreads(blocked); \ - return (wxDragResult)rval; \ - } \ + wxPyEndBlockThreads(blocked); \ + return (wxDragResult)rval; \ + } \ //--------------------------------------------------------------------------- @@ -1881,13 +1881,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b, const wxString& c) { \ bool rval=False; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* s = wx2PyString(c); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ Py_DECREF(s); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1902,10 +1902,10 @@ extern wxPyApp *wxPythonApp; size_t CLASS::CBNAME() { \ size_t rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1921,14 +1921,14 @@ extern wxPyApp *wxPythonApp; size_t base_##CBNAME() const -#define IMP_PYCALLBACK_SIZET__const(CLASS, PCLASS, CBNAME) \ +#define IMP_PYCALLBACK_SIZET__const(CLASS, PCLASS, CBNAME) \ size_t CLASS::CBNAME() const { \ size_t rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1948,7 +1948,7 @@ extern wxPyApp *wxPythonApp; wxDataFormat CLASS::CBNAME(size_t a) { \ wxDataFormat rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxDataFormat* ptr; \ @@ -1959,7 +1959,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1978,13 +1978,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ void CLASS::CBNAME(const Type& a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -2003,13 +2003,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ void CLASS::CBNAME(Type& a) { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -2028,13 +2028,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(Type& a) { \ bool rv=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rv = PCLASS::CBNAME(a); \ return rv; \ @@ -2052,13 +2052,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ bool CLASS::CBNAME(Type& a) { \ bool rv=False; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } \ @@ -2072,7 +2072,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(long a, long b) const { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \ @@ -2081,7 +2081,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -2101,7 +2101,7 @@ extern wxPyApp *wxPythonApp; int CLASS::CBNAME(long a) const { \ int rval=-1; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2110,7 +2110,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2131,7 +2131,7 @@ extern wxPyApp *wxPythonApp; wxListItemAttr *CLASS::CBNAME(long a) const { \ wxListItemAttr *rval = NULL; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxListItemAttr* ptr; \ @@ -2142,7 +2142,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2161,7 +2161,7 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(wxMouseEvent& e) { \ bool rval=False; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ PyObject* obj = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ @@ -2172,7 +2172,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(e); \ return rval; \ @@ -2190,7 +2190,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \ wxWizardPage* CLASS::CBNAME() const { \ wxWizardPage* rv = NULL; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -2199,7 +2199,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2211,7 +2211,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \ wxBitmap CLASS::CBNAME() const { \ wxBitmap rv; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxBitmap* ptr; \ @@ -2222,7 +2222,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2234,7 +2234,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME() { \ wxObject* rv = NULL; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -2243,7 +2243,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2255,7 +2255,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME(const wxString& a) { \ wxObject* rv = NULL; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* so = wx2PyString(a); \ PyObject* ro; \ @@ -2266,7 +2266,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(so); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2279,13 +2279,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxXmlNode* a) { \ bool rv=False; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0); \ + PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } \ @@ -2299,11 +2299,11 @@ extern wxPyApp *wxPythonApp; wxCoord CLASS::CBNAME(size_t a) const { \ wxCoord rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -2317,10 +2317,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(size_t a, size_t b) const { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -2339,10 +2339,10 @@ extern wxPyApp *wxPythonApp; wxCoord CLASS::CBNAME() const { \ wxCoord rval=0; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -2360,14 +2360,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ } \ //--------------------------------------------------------------------------- @@ -2380,14 +2380,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ } \ @@ -2406,7 +2406,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(size_t a) const { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2415,7 +2415,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2433,7 +2433,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(size_t a) const { \ wxString rval; \ bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2442,7 +2442,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(blocked); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \