X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26eac43ed138355a6c8e091d03696a715b6df559..5b8f917c3007b1776f55cba6b71843b83d412bf3:/wxPython/include/wx/wxPython/wxPython_int.h diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h index ed07d2ee97..f942120404 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -139,13 +139,25 @@ PyThreadState* wxPyBeginAllowThreads(); void wxPyEndAllowThreads(PyThreadState* state); // For C++ --> Python -void wxPyBeginBlockThreads(); -void wxPyEndBlockThreads(); +bool wxPyBeginBlockThreads(); +void wxPyEndBlockThreads(bool blocked); #endif // wxPyUSE_EXPORTED_API -#define wxPyBLOCK_THREADS(stmt) { wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(); } -#define wxPyRaiseNotImplemented() wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError)) + +// A macro that will help to execute simple statments wrapped in +// StartBlock/EndBlockThreads calls +#define wxPyBLOCK_THREADS(stmt) \ + { bool blocked = wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(blocked); } + +// Raise the NotImplementedError exception (blocking threads) +#define wxPyRaiseNotImplemented() \ + wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError)) + +// Raise any exception witha string value (blocking threads) +#define wxPyErr_SetString(err, str) \ + wxPyBLOCK_THREADS(PyErr_SetString(err, str)) + //--------------------------------------------------------------------------- // These are helpers used by the typemaps @@ -175,7 +187,9 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj); bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen); bool wxColour_typecheck(PyObject* source); +bool wxPyCheckForApp(); + template bool wxPyTwoIntItem_helper(PyObject* source, T** obj, const wxChar* name) { @@ -365,8 +379,8 @@ struct wxPyCoreAPI { PyThreadState* (*p_wxPyBeginAllowThreads)(); void (*p_wxPyEndAllowThreads)(PyThreadState* state); - void (*p_wxPyBeginBlockThreads)(); - void (*p_wxPyEndBlockThreads)(); + bool (*p_wxPyBeginBlockThreads)(); + void (*p_wxPyEndBlockThreads)(bool blocked); PyObject* (*p_wxPy_ConvertList)(wxListBase* list); @@ -416,7 +430,9 @@ struct wxPyCoreAPI { bool (*p_wxPyInstance_Check)(PyObject* obj); bool (*p_wxPySwigInstance_Check)(PyObject* obj); - + + bool (*p_wxPyCheckForApp)(); + }; #ifdef wxPyUSE_EXPORTED_API @@ -625,10 +641,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -646,10 +662,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b) { \ bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -668,10 +684,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -689,10 +705,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -710,10 +726,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -731,10 +747,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c,d); \ } \ @@ -751,10 +767,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c,d,e); \ } \ @@ -773,7 +789,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -795,7 +811,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -815,7 +831,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); \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -837,7 +853,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(); \ else \ @@ -858,10 +874,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(bool a) { \ bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -880,10 +896,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -898,15 +914,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; \ - wxPyBeginBlockThreads(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ - else rval = False; \ - wxPyEndBlockThreads(); \ - 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; \ } @@ -920,13 +936,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -946,13 +962,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -970,13 +986,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -994,10 +1010,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1015,11 +1031,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c, int d) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ a,b,c,d)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d); \ } \ @@ -1037,13 +1053,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ } \ @@ -1061,14 +1077,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b, c, d, e, f); \ return rval; \ @@ -1087,11 +1103,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1109,13 +1125,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1133,13 +1149,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1158,13 +1174,13 @@ extern wxPyApp *wxPythonApp; void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \ int e, int f) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ } \ @@ -1183,13 +1199,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ } \ @@ -1208,10 +1224,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c); \ } \ @@ -1229,10 +1245,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d) { \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b, c, d); \ } \ @@ -1250,13 +1266,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(const wxString& a) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1274,13 +1290,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(const wxString& a) { \ bool rval=False; \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1297,13 +1313,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ bool rval=False; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1315,7 +1331,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1326,7 +1342,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1340,7 +1356,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1353,7 +1369,7 @@ extern wxPyApp *wxPythonApp; } \ if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1365,7 +1381,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ wxString rval; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ PyObject* s = wx2PyString(a); \ @@ -1376,7 +1392,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1390,7 +1406,7 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ bool rval=False; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s1 = wx2PyString(a); \ PyObject* s2 = wx2PyString(b); \ @@ -1398,7 +1414,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(s1); \ Py_DECREF(s2); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1417,7 +1433,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME() { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1426,7 +1442,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1445,7 +1461,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME() const { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1454,7 +1470,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1471,7 +1487,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1480,7 +1496,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1492,7 +1508,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() const { \ wxString rval; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -1501,7 +1517,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1514,13 +1530,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ bool rval=False; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1533,13 +1549,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(cell, x, y); \ } \ @@ -1547,30 +1563,52 @@ extern wxPyApp *wxPythonApp; PCLASS::CBNAME(cell, x, y); \ } - //--------------------------------------------------------------------------- -#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) +#define DEC_PYCALLBACK__COLOUR(CBNAME) \ + void CBNAME(const wxColour& c); \ + void base_##CBNAME(const wxColour& c) -#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ +#define IMP_PYCALLBACK__COLOUR(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(const wxColour& c) { \ bool found; \ - wxPyBeginBlockThreads(); \ + 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)); \ + PyObject* obj = wxPyConstructObject((void*)&c, wxT("wxColour"), 0); \ + wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \ Py_DECREF(obj); \ - Py_DECREF(o2); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ - PCLASS::CBNAME(cell, x, y, e); \ + PCLASS::CBNAME(c); \ } \ - void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ - PCLASS::CBNAME(cell, x, y, e); \ + void CLASS::base_##CBNAME(const wxColour& c) { \ + PCLASS::CBNAME(c); \ + } + +//--------------------------------------------------------------------------- + +#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) + +#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); \ } @@ -1583,10 +1621,10 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ } //--------------------------------------------------------------------------- @@ -1599,7 +1637,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); \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxSize* ptr; \ @@ -1623,7 +1661,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1638,13 +1676,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(wxWindow* a) { \ bool rval=False; \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1660,11 +1698,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* win = wxPyMake_wxObject(a); \ PyObject* dc = wxPyMake_wxObject(&b); \ @@ -1672,7 +1710,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(win); \ Py_DECREF(dc); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1691,13 +1729,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxWindowBase* a) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1716,10 +1754,10 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME() { \ bool rval=False; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1739,10 +1777,10 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME() const { \ bool rval=False; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1762,10 +1800,10 @@ extern wxPyApp *wxPythonApp; wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ int rval=0; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b, c); \ return (wxDragResult)rval; \ @@ -1779,25 +1817,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) { \ - 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(); \ - 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; \ }; //--------------------------------------------------------------------------- @@ -1807,20 +1845,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; \ - 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(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); \ } //--------------------------------------------------------------------------- @@ -1829,15 +1867,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) { \ - 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(); \ - return (wxDragResult)rval; \ - } \ + wxPyEndBlockThreads(blocked); \ + return (wxDragResult)rval; \ + } \ //--------------------------------------------------------------------------- @@ -1847,13 +1885,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1868,10 +1906,10 @@ extern wxPyApp *wxPythonApp; size_t CLASS::CBNAME() { \ size_t rval=0; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1887,14 +1925,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1914,7 +1952,7 @@ extern wxPyApp *wxPythonApp; wxDataFormat CLASS::CBNAME(size_t a) { \ wxDataFormat rval=0; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxDataFormat* ptr; \ @@ -1925,7 +1963,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1944,13 +1982,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ void CLASS::CBNAME(const Type& a) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1969,13 +2007,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ void CLASS::CBNAME(Type& a) { \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1994,13 +2032,13 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(Type& a) { \ bool rv=False; \ bool found; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rv = PCLASS::CBNAME(a); \ return rv; \ @@ -2018,13 +2056,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ bool CLASS::CBNAME(Type& a) { \ bool rv=False; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } \ @@ -2038,7 +2076,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(long a, long b) const { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \ @@ -2047,7 +2085,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -2067,7 +2105,7 @@ extern wxPyApp *wxPythonApp; int CLASS::CBNAME(long a) const { \ int rval=-1; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2076,7 +2114,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2097,7 +2135,7 @@ extern wxPyApp *wxPythonApp; wxListItemAttr *CLASS::CBNAME(long a) const { \ wxListItemAttr *rval = NULL; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxListItemAttr* ptr; \ @@ -2108,7 +2146,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2127,7 +2165,7 @@ extern wxPyApp *wxPythonApp; bool CLASS::CBNAME(wxMouseEvent& e) { \ bool rval=False; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ PyObject* obj = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ @@ -2138,7 +2176,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(e); \ return rval; \ @@ -2156,7 +2194,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \ wxWizardPage* CLASS::CBNAME() const { \ wxWizardPage* rv = NULL; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -2165,7 +2203,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2177,7 +2215,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \ wxBitmap CLASS::CBNAME() const { \ wxBitmap rv; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxBitmap* ptr; \ @@ -2188,7 +2226,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2200,7 +2238,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME() { \ wxObject* rv = NULL; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ @@ -2209,7 +2247,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2221,7 +2259,7 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME(const wxString& a) { \ wxObject* rv = NULL; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* so = wx2PyString(a); \ PyObject* ro; \ @@ -2232,7 +2270,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(so); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2245,13 +2283,13 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxXmlNode* a) { \ bool rv=False; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } \ @@ -2265,11 +2303,11 @@ extern wxPyApp *wxPythonApp; wxCoord CLASS::CBNAME(size_t a) const { \ wxCoord rval=0; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -2283,10 +2321,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; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -2305,10 +2343,10 @@ extern wxPyApp *wxPythonApp; wxCoord CLASS::CBNAME() const { \ wxCoord rval=0; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -2326,14 +2364,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ } \ //--------------------------------------------------------------------------- @@ -2346,14 +2384,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; \ - 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(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b,c); \ } \ @@ -2372,7 +2410,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(size_t a) const { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2381,7 +2419,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2399,7 +2437,7 @@ extern wxPyApp *wxPythonApp; wxString CLASS::CBNAME(size_t a) const { \ wxString rval; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ @@ -2408,10 +2446,41 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_VIZATTR_(CBNAME) \ + wxVisualAttributes CBNAME() const; \ + wxVisualAttributes base_##CBNAME() + + +#define IMP_PYCALLBACK_VIZATTR_(CLASS, PCLASS, CBNAME) \ + wxVisualAttributes CLASS::CBNAME() const { \ + wxVisualAttributes rval; \ + bool found; \ + bool blocked = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + wxVisualAttributes* ptr; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + if (ro) { \ + if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxVisualAttributes"))) \ + rval = *ptr; \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(blocked); \ + if (! found) \ + rval = PCLASS::CBNAME(); \ + return rval; \ + } \ + wxVisualAttributes CLASS::base_##CBNAME() { \ + return PCLASS::CBNAME(); \ + } + +//--------------------------------------------------------------------------- + #endif