X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f048f8290f5388de598e0108aa5b4a01c68269d5..c9c2cf703c1213a7413d41d7d69a5c21b7acb63b:/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 af51069726..e5c69c2699 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -20,11 +20,11 @@ #include #include +#include #include #include #include #include -#include #include #include #include @@ -83,15 +83,13 @@ typedef unsigned char byte; typedef wxPoint2DDouble wxPoint2D; -const bool True = true; -const bool False = false; - #ifndef wxPyUSE_EXPORTED_API void __wxPyPreStart(PyObject*); void __wxPyCleanup(); PyObject* __wxPySetDictionary(PyObject*, PyObject* args); +PyObject* __wxPyFixStockObjects(PyObject*, PyObject* args); void wxPyEventThunker(wxObject*, wxEvent& event); @@ -109,14 +107,14 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* classname); PyObject* wx2PyString(const wxString& src); wxString Py2wxString(PyObject* source); -PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=True); -PyObject* wxPyMake_wxSizer(wxSizer* source); +PyObject* wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler=true); +PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn); void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); PyObject* wxPy_ConvertList(wxListBase* list); long wxPyGetWinHandle(wxWindow* win); -void wxPy_ReinitStockObjects(bool init); +void wxPy_ReinitStockObjects(int pass); bool wxPyInstance_Check(PyObject* obj); bool wxPySwigInstance_Check(PyObject* obj); @@ -139,12 +137,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() + +// 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 @@ -174,7 +185,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) { @@ -184,7 +197,7 @@ bool wxPyTwoIntItem_helper(PyObject* source, T** obj, const wxChar* name) if (! wxPyConvertSwigPtr(source, (void **)&ptr, name)) goto error; *obj = ptr; - return True; + return true; } // otherwise a 2-tuple of integers is expected else if (PySequence_Check(source) && PyObject_Length(source) == 2) { @@ -198,14 +211,14 @@ bool wxPyTwoIntItem_helper(PyObject* source, T** obj, const wxChar* name) **obj = T(PyInt_AsLong(o1), PyInt_AsLong(o2)); Py_DECREF(o1); Py_DECREF(o2); - return True; + return true; } error: wxString msg; msg.Printf(wxT("Expected a 2-tuple of integers or a %s object."), name); PyErr_SetString(PyExc_TypeError, msg.mb_str()); - return False; + return false; } @@ -260,7 +273,7 @@ public: wxPyEvtSelfRef(); ~wxPyEvtSelfRef(); - void SetSelf(PyObject* self, bool clone=False); + void SetSelf(PyObject* self, bool clone=false); PyObject* GetSelf() const; bool GetCloned() const { return m_cloned; } @@ -315,13 +328,13 @@ class wxPyCallbackHelper; struct swig_type_info; struct swig_const_info; - // Make SunCC happy and make typedef's for these that are extern "C" typedef swig_type_info* (*p_SWIG_Python_TypeRegister_t)(swig_type_info *); typedef swig_type_info* (*p_SWIG_Python_TypeCheck_t)(char *c, swig_type_info *); typedef void* (*p_SWIG_Python_TypeCast_t)(swig_type_info *, void *); typedef swig_type_info* (*p_SWIG_Python_TypeDynamicCast_t)(swig_type_info *, void **); typedef const char* (*p_SWIG_Python_TypeName_t)(const swig_type_info *); +typedef const char * (*p_SWIG_Python_TypePrettyName_t)(const swig_type_info *); typedef swig_type_info* (*p_SWIG_Python_TypeQuery_t)(const char *); typedef void (*p_SWIG_Python_TypeClientData_t)(swig_type_info *, void *); typedef PyObject* (*p_SWIG_Python_newvarlink_t)(void); @@ -333,7 +346,7 @@ typedef char* (*p_SWIG_Python_UnpackData_t)(char *c, void *, int); typedef PyObject* (*p_SWIG_Python_NewPointerObj_t)(void *, swig_type_info *,int own); typedef PyObject* (*p_SWIG_Python_NewPackedObj_t)(void *, int sz, swig_type_info *); typedef void (*p_SWIG_Python_InstallConstants_t)(PyObject *d, swig_const_info constants[]); -typedef void* (*p_SWIG_Python_MustGetPtr_t)(PyObject *, swig_type_info *, int, int); +typedef void* (*p_SWIG_Python_MustGetPtr_t)(PyObject *, swig_type_info *, int, int); struct wxPyCoreAPI { @@ -343,6 +356,7 @@ struct wxPyCoreAPI { p_SWIG_Python_TypeCast_t p_SWIG_Python_TypeCast; p_SWIG_Python_TypeDynamicCast_t p_SWIG_Python_TypeDynamicCast; p_SWIG_Python_TypeName_t p_SWIG_Python_TypeName; + p_SWIG_Python_TypePrettyName_t p_SWIG_Python_TypePrettyName; p_SWIG_Python_TypeQuery_t p_SWIG_Python_TypeQuery; p_SWIG_Python_TypeClientData_t p_SWIG_Python_TypeClientData; p_SWIG_Python_newvarlink_t p_SWIG_Python_newvarlink; @@ -356,7 +370,6 @@ struct wxPyCoreAPI { p_SWIG_Python_InstallConstants_t p_SWIG_Python_InstallConstants; p_SWIG_Python_MustGetPtr_t p_SWIG_Python_MustGetPtr; - bool (*p_wxPyCheckSwigType)(const wxChar* className); PyObject* (*p_wxPyConstructObject)(void* ptr, const wxChar* className, int setThisOwn); bool (*p_wxPyConvertSwigPtr)(PyObject* obj, void **ptr, const wxChar* className); @@ -364,8 +377,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); @@ -399,8 +412,8 @@ struct wxPyCoreAPI { PyObject* (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple); void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh); - PyObject* (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler); - PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source); + PyObject* (*p_wxPyMake_wxObject)(wxObject* source, bool setThisOwn, bool checkEvtHandler); + PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source, bool setThisOwn); void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName); bool (*p_wxPy2int_seq_helper)(PyObject* source, int* i1, int* i2); bool (*p_wxPy4int_seq_helper)(PyObject* source, int* i1, int* i2, int* i3, int* i4); @@ -415,13 +428,16 @@ struct wxPyCoreAPI { bool (*p_wxPyInstance_Check)(PyObject* obj); bool (*p_wxPySwigInstance_Check)(PyObject* obj); - + + bool (*p_wxPyCheckForApp)(); + }; #ifdef wxPyUSE_EXPORTED_API // Notice that this is static, not extern. This is by design, each module // needs one, but doesn't have to use it. static wxPyCoreAPI* wxPyCoreAPIPtr = NULL; +inline wxPyCoreAPI* wxPyGetCoreAPIPtr(); #endif // wxPyUSE_EXPORTED_API //--------------------------------------------------------------------------- @@ -436,7 +452,7 @@ public: ~wxPyUserData() { #ifdef wxPyUSE_EXPORTED_API - wxPyCoreAPIPtr->p_wxPyUserData_dtor(this); + wxPyGetCoreAPIPtr()->p_wxPyUserData_dtor(this); #else wxPyUserData_dtor(this); #endif @@ -455,7 +471,7 @@ public: ~wxPyClientData() { #ifdef wxPyUSE_EXPORTED_API - wxPyCoreAPIPtr->p_wxPyClientData_dtor(this); + wxPyGetCoreAPIPtr()->p_wxPyClientData_dtor(this); #else wxPyClientData_dtor(this); #endif @@ -473,7 +489,7 @@ public: ~wxPyOORClientData() { #ifdef wxPyUSE_EXPORTED_API - wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this); + wxPyGetCoreAPIPtr()->p_wxPyOORClientData_dtor(this); #else wxPyOORClientData_dtor(this); #endif @@ -497,18 +513,18 @@ public: m_class = NULL; m_self = NULL; m_lastFound = NULL; - m_incRef = False; + m_incRef = false; } ~wxPyCallbackHelper() { #ifdef wxPyUSE_EXPORTED_API - wxPyCoreAPIPtr->p_wxPyCBH_delete(this); + wxPyGetCoreAPIPtr()->p_wxPyCBH_delete(this); #else wxPyCBH_delete(this); #endif } - void setSelf(PyObject* self, PyObject* klass, int incref=True); + void setSelf(PyObject* self, PyObject* klass, int incref=true); bool findCallback(const char* name) const; int callCallback(PyObject* argTuple) const; PyObject* callCallbackObj(PyObject* argTuple) const; @@ -578,6 +594,11 @@ public: #endif // virtual int FilterEvent(wxEvent& event); // This one too???? + // For catching Apple Events + virtual void MacOpenFile(const wxString &fileName); + virtual void MacPrintFile(const wxString &fileName); + virtual void MacNewFile(); + virtual void MacReopenApp(); static bool GetMacSupportPCMenuShortcuts(); static long GetMacAboutMenuItemId(); @@ -619,10 +640,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(); \ } \ @@ -639,11 +660,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b) { \ - bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool rval=false, found; \ + 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; \ @@ -662,10 +683,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(); \ } \ @@ -683,10 +704,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); \ } \ @@ -704,10 +725,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); \ } \ @@ -725,10 +746,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); \ } \ @@ -745,10 +766,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); \ } \ @@ -767,7 +788,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("()")); \ @@ -789,7 +810,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a,b); \ } \ @@ -809,7 +830,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("()")); \ @@ -831,7 +852,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(); \ else \ @@ -851,11 +872,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(bool a) { \ - bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool rval=false, found; \ + 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; \ @@ -873,11 +894,11 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ - bool rval=False, found; \ - wxPyBeginBlockThreads(); \ + bool rval=false, found; \ + 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; \ @@ -892,15 +913,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; \ } @@ -914,13 +935,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -940,13 +961,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -964,13 +985,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -988,10 +1009,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); \ } \ @@ -1009,11 +1030,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); \ } \ @@ -1031,13 +1052,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ 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); \ } \ @@ -1055,14 +1076,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 rval=False; \ + bool blocked = wxPyBeginBlockThreads(); \ + bool rval=false; \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyMake_wxObject(&a); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ 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; \ @@ -1081,11 +1102,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); \ } \ @@ -1103,13 +1124,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ 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); \ } \ @@ -1127,13 +1148,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); \ + PyObject* obj = wxPyMake_wxObject(&a,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a, b); \ } \ @@ -1152,13 +1173,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); \ + PyObject* obj = wxPyMake_wxObject(a,false); \ 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); \ } \ @@ -1177,13 +1198,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); \ + PyObject* obj = wxPyMake_wxObject(a,false); \ 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); \ } \ @@ -1202,10 +1223,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); \ } \ @@ -1223,10 +1244,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); \ } \ @@ -1244,13 +1265,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); \ } \ @@ -1266,15 +1287,15 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ - bool rval=False; \ + 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; \ @@ -1290,14 +1311,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ - bool rval=False; \ - wxPyBeginBlockThreads(); \ + bool rval=false; \ + 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; \ } \ @@ -1309,7 +1330,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); \ @@ -1320,7 +1341,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1334,7 +1355,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); \ @@ -1347,7 +1368,7 @@ extern wxPyApp *wxPythonApp; } \ if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1359,7 +1380,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); \ @@ -1370,7 +1391,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } \ @@ -1382,9 +1403,9 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ - bool rval=False; \ + bool rval=false; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* s1 = wx2PyString(a); \ PyObject* s2 = wx2PyString(b); \ @@ -1392,7 +1413,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(s1); \ Py_DECREF(s2); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1411,7 +1432,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("()")); \ @@ -1420,7 +1441,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1439,7 +1460,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("()")); \ @@ -1448,7 +1469,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(); \ return rval; \ @@ -1465,7 +1486,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("()")); \ @@ -1474,7 +1495,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1486,7 +1507,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("()")); \ @@ -1495,7 +1516,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1507,14 +1528,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ - bool rval=False; \ - wxPyBeginBlockThreads(); \ + bool rval=false; \ + 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; \ } @@ -1527,13 +1548,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); \ } \ @@ -1541,30 +1562,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); \ } @@ -1577,10 +1620,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); \ } //--------------------------------------------------------------------------- @@ -1593,7 +1636,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; \ @@ -1617,7 +1660,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rval; \ } @@ -1630,15 +1673,15 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxWindow* a) { \ - bool rval=False; \ + bool rval=false; \ bool found; \ - wxPyBeginBlockThreads(); \ + bool blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyMake_wxObject(a); \ + PyObject* obj = wxPyMake_wxObject(a,false); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1654,19 +1697,19 @@ 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 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); \ + PyObject* win = wxPyMake_wxObject(a,false); \ + PyObject* dc = wxPyMake_wxObject(&b,false); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\ Py_DECREF(win); \ Py_DECREF(dc); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ @@ -1685,13 +1728,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); \ + PyObject* obj = wxPyMake_wxObject(a,false); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -1708,12 +1751,12 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME() { \ - bool rval=False; \ + 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; \ @@ -1731,12 +1774,12 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_const(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME() const { \ - bool rval=False; \ + 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; \ @@ -1756,10 +1799,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; \ @@ -1773,25 +1816,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,false); \ + 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; \ }; //--------------------------------------------------------------------------- @@ -1801,20 +1844,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); \ } //--------------------------------------------------------------------------- @@ -1823,15 +1866,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; \ + } \ //--------------------------------------------------------------------------- @@ -1840,14 +1883,14 @@ 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 rval=false; \ + 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; \ } \ @@ -1862,10 +1905,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; \ @@ -1881,14 +1924,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; \ @@ -1908,7 +1951,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; \ @@ -1919,7 +1962,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -1938,13 +1981,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); \ } \ @@ -1963,13 +2006,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); \ } \ @@ -1986,15 +2029,15 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ bool CLASS::CBNAME(Type& a) { \ - bool rv=False; \ + 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; \ @@ -2011,14 +2054,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ bool CLASS::CBNAME(Type& a) { \ - bool rv=False; \ - wxPyBeginBlockThreads(); \ + bool rv=false; \ + 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; \ } \ @@ -2032,7 +2075,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)); \ @@ -2041,7 +2084,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a,b); \ return rval; \ @@ -2061,7 +2104,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)); \ @@ -2070,7 +2113,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2080,6 +2123,30 @@ extern wxPyApp *wxPythonApp; } + + +#define DEC_PYCALLBACK_INT_LONG_virtual(CBNAME) \ + int CBNAME(long a) const; + + +#define IMP_PYCALLBACK_INT_LONG_virtual(CLASS, PCLASS, CBNAME) \ + int CLASS::CBNAME(long a) const { \ + int rval=-1; /* this rval is important for OnGetItemImage */ \ + bool found; \ + bool blocked = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ + if (ro) { \ + rval = PyInt_AsLong(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(blocked); \ + return rval; \ + } + + //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME) \ @@ -2091,7 +2158,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; \ @@ -2102,7 +2169,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2119,9 +2186,9 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxMouseEvent& e) { \ - bool rval=False; \ + 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); \ @@ -2132,7 +2199,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ return PCLASS::CBNAME(e); \ return rval; \ @@ -2150,7 +2217,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("()")); \ @@ -2159,7 +2226,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2171,7 +2238,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; \ @@ -2182,7 +2249,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2194,7 +2261,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("()")); \ @@ -2203,7 +2270,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2215,7 +2282,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; \ @@ -2226,7 +2293,7 @@ extern wxPyApp *wxPythonApp; } \ Py_DECREF(so); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ return rv; \ } @@ -2238,14 +2305,14 @@ extern wxPyApp *wxPythonApp; #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxXmlNode* a) { \ - bool rv=False; \ - wxPyBeginBlockThreads(); \ + bool rv=false; \ + 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; \ } \ @@ -2259,11 +2326,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; \ } \ @@ -2277,10 +2344,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); \ } \ @@ -2299,10 +2366,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; \ @@ -2320,14 +2387,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* obj = wxPyMake_wxObject(&a,false); \ 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); \ } \ //--------------------------------------------------------------------------- @@ -2340,14 +2407,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* obj = wxPyMake_wxObject(&a,false); \ 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); \ } \ @@ -2366,7 +2433,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)); \ @@ -2375,7 +2442,7 @@ extern wxPyApp *wxPythonApp; Py_DECREF(ro); \ } \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(blocked); \ if (! found) \ rval = PCLASS::CBNAME(a); \ return rval; \ @@ -2393,7 +2460,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)); \ @@ -2402,9 +2469,40 @@ 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(); \ + } //---------------------------------------------------------------------------