X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33510773054b4e60aeb3715941f7e4faefafe103..bf44306ebca5d26e204ef17851516d844bc2f0a7:/wxPython/src/helpers.h diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index dcc6fb1aea..46d04e9f60 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -15,7 +15,6 @@ #include - //---------------------------------------------------------------------- // if we want to handle threads and Python threads are available... @@ -34,15 +33,8 @@ //--------------------------------------------------------------------------- -#if defined(__WXMSW__) -# define HELPEREXPORT __declspec(dllexport) -#else -# define HELPEREXPORT -#endif - typedef unsigned char byte; -//---------------------------------------------------------------------- class wxPyApp: public wxApp { @@ -51,9 +43,7 @@ public: ~wxPyApp(); int MainLoop(void); bool OnInit(void); -//# void AfterMainLoop(void); }; - extern wxPyApp *wxPythonApp; //---------------------------------------------------------------------- @@ -62,32 +52,39 @@ void __wxPreStart(); PyObject* __wxStart(PyObject*, PyObject* args); void __wxCleanup(); -extern PyObject* wxPython_dict; +//extern PyObject* wxPython_dict; PyObject* __wxSetDictionary(PyObject*, PyObject* args); void wxPyEventThunker(wxObject*, wxEvent& event); -HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, - const char* className, - int setThisOwn=0); -HELPEREXPORT bool wxPyRestoreThread(); -HELPEREXPORT void wxPySaveThread(bool doSave); -HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, const char* className); -HELPEREXPORT long wxPyGetWinHandle(wxWindow* win); +PyObject* wxPyConstructObject(void* ptr, + const char* className, + int setThisOwn=0); +PyObject* wxPyConstructObject(void* ptr, + const char* className, + PyObject* klass, + int setThisOwn=0); +PyObject* wxPyClassExists(const char* className); +PyObject* wxPyMake_wxObject(wxObject* source); +void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); + +PyObject* wxPy_ConvertList(wxListBase* list, const char* className); +long wxPyGetWinHandle(wxWindow* win); //---------------------------------------------------------------------- -class wxPyUserData : public wxObject { -public: - wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); } - ~wxPyUserData() { - bool doSave = wxPyRestoreThread(); - Py_DECREF(m_obj); - wxPySaveThread(doSave); - } - PyObject* m_obj; +struct wxPyTState { + PyThreadState* newState; + PyThreadState* prevState; + + wxPyTState() : newState(NULL), prevState(NULL) {} }; + +wxPyTState* wxPyBeginBlockThreads(); +void wxPyEndBlockThreads(wxPyTState* state); + + //---------------------------------------------------------------------- // Handle wxInputStreams by Joerg Baumann // See stream.i for implementations @@ -98,7 +95,7 @@ WX_DECLARE_LIST(wxString, wxStringPtrList); // C++ class wxPyInputStream to act as base for python class wxInputStream // Use it in python like a python file object -class wxPyInputStream{ +class wxPyInputStream { public: // underlying wxInputStream wxInputStream* wxi; @@ -129,20 +126,20 @@ public: //---------------------------------------------------------------------- // These are helpers used by the typemaps -HELPEREXPORT byte* byte_LIST_helper(PyObject* source); -HELPEREXPORT int* int_LIST_helper(PyObject* source); -HELPEREXPORT long* long_LIST_helper(PyObject* source); -HELPEREXPORT char** string_LIST_helper(PyObject* source); -HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); -HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); -HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); -HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); - -HELPEREXPORT bool wxSize_helper(PyObject* source, wxSize** obj); -HELPEREXPORT bool wxPoint_helper(PyObject* source, wxPoint** obj); -HELPEREXPORT bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); -HELPEREXPORT bool wxRect_helper(PyObject* source, wxRect** obj); -HELPEREXPORT bool wxColour_helper(PyObject* source, wxColour** obj); +byte* byte_LIST_helper(PyObject* source); +int* int_LIST_helper(PyObject* source); +long* long_LIST_helper(PyObject* source); +char** string_LIST_helper(PyObject* source); +wxPoint* wxPoint_LIST_helper(PyObject* source, int* npoints); +wxBitmap** wxBitmap_LIST_helper(PyObject* source); +wxString* wxString_LIST_helper(PyObject* source); +wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); + +bool wxSize_helper(PyObject* source, wxSize** obj); +bool wxPoint_helper(PyObject* source, wxPoint** obj); +bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); +bool wxRect_helper(PyObject* source, wxRect** obj); +bool wxColour_helper(PyObject* source, wxColour** obj); //---------------------------------------------------------------------- @@ -158,13 +155,6 @@ extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type); # pragma warning(disable:4190) #endif - - -// Non-const versions to keep SWIG happy. -extern wxPoint wxPyDefaultPosition; -extern wxSize wxPyDefaultSize; -extern wxString wxPyEmptyStr; - //---------------------------------------------------------------------- class wxPyCallback : public wxObject { @@ -193,9 +183,98 @@ private: }; //--------------------------------------------------------------------------- +//--------------------------------------------------------------------------- +// These Event classes can be derived from in Python and passed through the +// event system without loosing anything. They do this by keeping a reference +// to themselves and some special case handling in wxPyCallback::EventThunker. + + +class wxPyEvtSelfRef { +public: + wxPyEvtSelfRef(); + ~wxPyEvtSelfRef(); + + void SetSelf(PyObject* self, bool clone=FALSE); + PyObject* GetSelf() const; + +protected: + PyObject* m_self; + bool m_cloned; +}; + + +class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { + DECLARE_DYNAMIC_CLASS(wxPyEvent) +public: + wxPyEvent(int id=0); + ~wxPyEvent(); + + void CopyObject(wxObject& dest) const; +}; + + +class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef { + DECLARE_DYNAMIC_CLASS(wxPyCommandEvent) +public: + wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0); + ~wxPyCommandEvent(); + void CopyObject(wxObject& dest) const; +}; +//--------------------------------------------------------------------------- +// Export a C API in a struct. Other modules will be able to load this from +// the wxc module and will then have safe access to these functions, even if +// in another shared library. + +class wxPyCallbackHelper; + +struct wxPyCoreAPI { + + void (*p_SWIG_MakePtr)(char*, void*, char*); + char* (*p_SWIG_GetPtr)(char*, void**, char*); + char* (*p_SWIG_GetPtrObj)(PyObject*, void**, char*); + void (*p_SWIG_RegisterMapping)(char*, char*, void *(*cast)(void *)); + void (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)); + PyObject* (*p_SWIG_newvarlink)(void); + + wxPyTState* (*p_wxPyBeginBlockThreads)(); + void (*p_wxPyEndBlockThreads)(wxPyTState* state); + + PyObject* (*p_wxPyConstructObject)(void *, const char *, int); + PyObject* (*p_wxPy_ConvertList)(wxListBase* list, const char* className); + + byte* (*p_byte_LIST_helper)(PyObject* source); + int* (*p_int_LIST_helper)(PyObject* source); + long* (*p_long_LIST_helper)(PyObject* source); + char** (*p_string_LIST_helper)(PyObject* source); + wxPoint* (*p_wxPoint_LIST_helper)(PyObject* source, int* npoints); + wxBitmap** (*p_wxBitmap_LIST_helper)(PyObject* source); + wxString* (*p_wxString_LIST_helper)(PyObject* source); + wxAcceleratorEntry* (*p_wxAcceleratorEntry_LIST_helper)(PyObject* source); + + bool (*p_wxSize_helper)(PyObject* source, wxSize** obj); + bool (*p_wxPoint_helper)(PyObject* source, wxPoint** obj); + bool (*p_wxRealPoint_helper)(PyObject* source, wxRealPoint** obj); + bool (*p_wxRect_helper)(PyObject* source, wxRect** obj); + bool (*p_wxColour_helper)(PyObject* source, wxColour** obj); + + void (*p_wxPyCBH_setSelf)(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref); + bool (*p_wxPyCBH_findCallback)(const wxPyCallbackHelper& cbh, const char* name); + int (*p_wxPyCBH_callCallback)(const wxPyCallbackHelper& cbh, PyObject* argTuple); + PyObject* (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple); + void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh); + + PyObject* (*p_wxPyClassExists)(const char* className); + PyObject* (*p_wxPyMake_wxObject)(wxObject* source); + void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName); + +}; + +#ifdef wxPyUSE_EXPORT +static wxPyCoreAPI* wxPyCoreAPIPtr = NULL; // Each module needs one, but may not use it. +#endif //--------------------------------------------------------------------------- // This class holds an instance of a Python Shadow Class object and assists @@ -204,19 +283,28 @@ private: // overridable in wxPython, a new subclass is created that contains a // wxPyCallbackHelper. // -// TODO: This class should be combined with wxPyCallback defined above. -// -class HELPEREXPORT wxPyCallbackHelper { +class wxPyCallbackHelper { public: - wxPyCallbackHelper(); - ~wxPyCallbackHelper(); - wxPyCallbackHelper(const wxPyCallbackHelper& other); - void setSelf(PyObject* self, PyObject* klass, int incref=TRUE); + wxPyCallbackHelper() { + m_class = NULL; + m_self = NULL; + m_lastFound = NULL; + m_incRef = FALSE; + } + + ~wxPyCallbackHelper() { +#ifdef wxPyUSE_EXPORT + wxPyCoreAPIPtr->p_wxPyCBH_delete(this); +#else + wxPyCBH_delete(this); +#endif + } - bool findCallback(const wxString& name) const; + 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; @@ -225,50 +313,67 @@ private: PyObject* m_class; PyObject* m_lastFound; int m_incRef; + + friend void wxPyCBH_delete(wxPyCallbackHelper* cbh); }; -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- -// These Event classes can be derived from in Python and passed through the -// event system without loosing anything. They do this by keeping a reference -// to themselves and some special case handling in wxPyCallback::EventThunker. +void wxPyCBH_setSelf(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref); +bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name); +int wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple); +PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTuple); +void wxPyCBH_delete(wxPyCallbackHelper* cbh); -class wxPyEvtSelfRef { -public: - wxPyEvtSelfRef(); - ~wxPyEvtSelfRef(); - - void SetSelf(PyObject* self, bool clone=FALSE); - PyObject* GetSelf() const; - -protected: - PyObject* m_self; - bool m_cloned; -}; +//---------------------------------------------------------------------- -class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { - DECLARE_DYNAMIC_CLASS(wxPyEvent) +class wxPyUserData : public wxObject { public: - wxPyEvent(int id=0); - ~wxPyEvent(); + wxPyUserData(PyObject* obj) { + m_obj = obj; + Py_INCREF(m_obj); + } - void CopyObject(wxObject& dest) const; + ~wxPyUserData() { +#ifdef wxPyUSE_EXPORT + wxPyTState* state = wxPyCoreAPIPtr->p_wxPyBeginBlockThreads(); + Py_DECREF(m_obj); + wxPyCoreAPIPtr->p_wxPyEndBlockThreads(state); +#else + wxPyTState* state = wxPyBeginBlockThreads(); + Py_DECREF(m_obj); + wxPyEndBlockThreads(state); +#endif + } + PyObject* m_obj; }; -class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef { - DECLARE_DYNAMIC_CLASS(wxPyCommandEvent) + +class wxPyClientData : public wxClientData { public: - wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0); - ~wxPyCommandEvent(); + wxPyClientData(PyObject* obj) { + m_obj = obj; + Py_INCREF(m_obj); + } - void CopyObject(wxObject& dest) const; + ~wxPyClientData() { +#ifdef wxPyUSE_EXPORT + wxPyTState* state = wxPyCoreAPIPtr->p_wxPyBeginBlockThreads(); + Py_DECREF(m_obj); + wxPyCoreAPIPtr->p_wxPyEndBlockThreads(state); +#else + wxPyTState* state = wxPyBeginBlockThreads(); + Py_DECREF(m_obj); + wxPyEndBlockThreads(state); +#endif + } + PyObject* m_obj; }; + //--------------------------------------------------------------------------- // These macros are used to implement the virtual methods that should // redirect to a Python method if one exists. The names designate the @@ -277,7 +382,7 @@ public: #define PYPRIVATE \ void _setSelf(PyObject* self, PyObject* _class, int incref=1) { \ - m_myInst.setSelf(self, _class, incref); \ + wxPyCBH_setSelf(m_myInst, self, _class, incref); \ } \ private: wxPyCallbackHelper m_myInst @@ -288,17 +393,18 @@ public: void base_##CBNAME(); -#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME() { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("()")); \ - else \ - PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME() { \ - PCLASS::CBNAME(); \ +#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME() { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(); \ + } \ + void CLASS::base_##CBNAME() { \ + PCLASS::CBNAME(); \ } //--------------------------------------------------------------------------- @@ -310,13 +416,13 @@ public: #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(ii)",a,b)); \ - else \ + bool rval=FALSE, found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a,b); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(int a, int b) { \ @@ -332,12 +438,13 @@ public: #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(ii)",a,b)); \ - else \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ + wxPyEndBlockThreads(state); \ + if (! found) \ PCLASS::CBNAME(a,b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(int a, int b) { \ PCLASS::CBNAME(a,b); \ @@ -352,13 +459,13 @@ public: #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(i)",a)); \ - else \ + bool rval=FALSE, found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(int a) { \ @@ -373,12 +480,12 @@ public: #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(i)",a)); \ + bool rval=FALSE; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ else rval = FALSE; \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(state); \ return rval; \ } @@ -390,18 +497,21 @@ public: void base_##CBNAME(wxDC& a); -#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(wxDC& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject(&a, "wxDC"))); \ - else \ - PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(wxDC& a) { \ - PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxDC& a) { \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(wxDC& a) { \ + PCLASS::CBNAME(a); \ } @@ -415,13 +525,16 @@ public: #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oi)", \ - wxPyConstructObject(&a, "wxDC"), (int)b)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, bool b) { \ PCLASS::CBNAME(a, b); \ @@ -436,13 +549,16 @@ public: #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oi)", \ - wxPyConstructObject(&a, "wxDC"), (int)b)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, bool b) { \ PCLASS::CBNAME(a, b); \ @@ -455,17 +571,18 @@ public: void base_##CBNAME(double a, double b); -#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(double a, double b) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(dd)",a,b)); \ - else \ - PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(double a, double b) { \ - PCLASS::CBNAME(a, b); \ +#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(double a, double b) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(a, b); \ + } \ + void CLASS::base_##CBNAME(double a, double b) { \ + PCLASS::CBNAME(a, b); \ } //--------------------------------------------------------------------------- @@ -477,13 +594,14 @@ public: #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c, int d) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(ddii)", \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ a,b,c,d)); \ - else \ + wxPyEndBlockThreads(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(double a, double b, int c, int d) { \ PCLASS::CBNAME(a, b, c, d); \ @@ -491,21 +609,23 @@ public: //--------------------------------------------------------------------------- -#define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME) \ +#define DEC_PYCALLBACK__DC4DBLBOOL(CBNAME) \ void CBNAME(wxDC& a, double b, double c, double d, double e, bool f); \ void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f); #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oddddi)", \ - wxPyConstructObject(&a, "wxDC"), \ - b, c, d, e, (int)f)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\ PCLASS::CBNAME(a, b, c, d, e, f); \ @@ -520,15 +640,17 @@ public: #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ - bool doSave = wxPyRestoreThread(); \ - bool rval; \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(Oddddi)", \ - wxPyConstructObject(&a, "wxDC"), \ - b, c, d, e, (int)f)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ rval = PCLASS::CBNAME(a, b, c, d, e, f); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\ @@ -544,13 +666,14 @@ public: #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d, int e) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(idii)", \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \ (int)a,b,c,d,e)); \ - else \ + wxPyEndBlockThreads(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(bool a, double b, double c, int d, int e) { \ PCLASS::CBNAME(a, b, c, d, e); \ @@ -558,21 +681,23 @@ public: //--------------------------------------------------------------------------- -#define DEC_PYCALLBACK__DC4DBL(CBNAME) \ +#define DEC_PYCALLBACK__DC4DBL(CBNAME) \ void CBNAME(wxDC& a, double b, double c, double d, double e); \ void base_##CBNAME(wxDC& a, double b, double c, double d, double e); #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Odddd)", \ - wxPyConstructObject(&a, "wxDC"), \ - b, c, d, e)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\ PCLASS::CBNAME(a, b, c, d, e); \ @@ -585,19 +710,21 @@ public: void base_##CBNAME(wxDC& a, bool b); -#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(wxDC& a, bool b) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oi)", \ - wxPyConstructObject(&a, "wxDC"), \ - (int)b)); \ - else \ - PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(wxDC& a, bool b) { \ - PCLASS::CBNAME(a, b); \ +#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxDC& a, bool b) { \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ + PCLASS::CBNAME(a, b); \ + } \ + void CLASS::base_##CBNAME(wxDC& a, bool b) { \ + PCLASS::CBNAME(a, b); \ } //--------------------------------------------------------------------------- @@ -610,14 +737,16 @@ public: #define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \ int e, int f) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oiddii)", \ - wxPyConstructObject(a, "wxPyControlPoint"), \ - (int)b, c, d, e, f)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d, e, f); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxControlPoint* a, bool b, double c, double d, \ int e, int f) { \ @@ -633,14 +762,16 @@ public: #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(Oddii)", \ - wxPyConstructObject(a, "wxPyControlPoint"), \ - b, c, d, e)); \ - else \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d, e); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxControlPoint* a, double b, double c, \ int d, int e) { \ @@ -654,17 +785,18 @@ public: void base_##CBNAME(double a, double b, int c); -#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(double a, double b, int c) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(ddi)", a,b,c)); \ - else \ - PCLASS::CBNAME(a, b, c); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(double a, double b, int c) { \ - PCLASS::CBNAME(a, b, c); \ +#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(double a, double b, int c) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(a, b, c); \ + } \ + void CLASS::base_##CBNAME(double a, double b, int c) { \ + PCLASS::CBNAME(a, b, c); \ } //--------------------------------------------------------------------------- @@ -676,12 +808,13 @@ public: #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(iddi)", (int)a,b,c,d)); \ - else \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\ + wxPyEndBlockThreads(state); \ + if (! found) \ PCLASS::CBNAME(a, b, c, d); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(bool a, double b, double c, int d) { \ PCLASS::CBNAME(a, b, c, d); \ @@ -695,17 +828,18 @@ public: void base_##CBNAME(const wxString& a); -#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(const wxString& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(s)", a.c_str())); \ - else \ - PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(const wxString& a) { \ - PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(const wxString& a) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(const wxString& a) { \ + PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -717,13 +851,14 @@ public: #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(s)", a.c_str())); \ - else \ + bool rval=FALSE; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));\ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(const wxString& a) { \ @@ -735,15 +870,15 @@ public: #define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME) \ bool CBNAME(const wxString& a); \ -#define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME(const wxString& a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(s)", a.c_str())); \ - wxPySaveThread(doSave); \ - return rval; \ - } \ +#define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(const wxString& a) { \ + bool rval=FALSE; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \ + wxPyEndBlockThreads(state); \ + return rval; \ + } \ //--------------------------------------------------------------------------- @@ -753,16 +888,17 @@ public: #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("(s)", a.c_str())); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(s)", a.c_str()));\ if (ro) { \ - rval = PyString_AsString(PyObject_Str(ro)); \ - Py_DECREF(ro); \ + PyObject* str = PyObject_Str(ro); \ + rval = PyString_AsString(str); \ + Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(state); \ return rval; \ } \ @@ -774,16 +910,17 @@ public: #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("(si)", a.c_str(),b)); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(si)", a.c_str(),b)); \ if (ro) { \ - rval = PyString_AsString(PyObject_Str(ro)); \ - Py_DECREF(ro); \ + PyObject* str = PyObject_Str(ro); \ + rval = PyString_AsString(str); \ + Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(state); \ return rval; \ } \ @@ -796,14 +933,15 @@ public: #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(ss)", \ + bool rval=FALSE; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ss)", \ a.c_str(), b.c_str())); \ - else \ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) { \ @@ -820,18 +958,20 @@ public: #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ - rval = PyString_AsString(PyObject_Str(ro)); \ - Py_DECREF(ro); \ + PyObject* str = PyObject_Str(ro); \ + rval = PyString_AsString(str); \ + Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - else \ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ return rval; \ } \ wxString CLASS::base_##CBNAME() { \ @@ -847,16 +987,17 @@ public: #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ - rval = PyString_AsString(PyObject_Str(ro)); \ - Py_DECREF(ro); \ + PyObject* str = PyObject_Str(ro); \ + rval = PyString_AsString(str); \ + Py_DECREF(ro); Py_DECREF(str); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(state); \ return rval; \ } @@ -868,12 +1009,14 @@ public: #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ - bool rval = FALSE; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject((void*)&a,"wxHtmlTag"))); \ - wxPySaveThread(doSave); \ + bool rval=FALSE; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + PyObject* obj = wxPyConstructObject((void*)&a, "wxHtmlTag", 0); \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(state); \ return rval; \ } @@ -885,10 +1028,10 @@ public: #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("()")); \ - wxPySaveThread(doSave); \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(state); \ } //--------------------------------------------------------------------------- @@ -900,18 +1043,18 @@ public: #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ wxSize CLASS::CBNAME() { \ wxSize rval(0,0); \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxSize* ptr; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) \ rval = *ptr; \ Py_DECREF(ro); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(state); \ return rval; \ } @@ -922,20 +1065,23 @@ public: bool base_##CBNAME(wxWindow* a); -#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME(wxWindow* a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject((void*)a,"wxWindow"))); \ - else \ - rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - return rval; \ - } \ - bool CLASS::base_##CBNAME(wxWindow* a) { \ - return PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxWindow* a) { \ + bool rval=FALSE; \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxWindow* a) { \ + return PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -945,41 +1091,43 @@ public: bool base_##CBNAME(); -#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME() { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("()")); \ - else \ - rval = PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ - return rval; \ - } \ - bool CLASS::base_##CBNAME() { \ - return PCLASS::CBNAME(); \ +#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME() { \ + bool rval=FALSE; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(state); \ + if (! found) \ + rval = PCLASS::CBNAME(); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME() { \ + return PCLASS::CBNAME(); \ } //--------------------------------------------------------------------------- -#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME) \ - wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); \ +#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME) \ + wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); \ wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def); -#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ - wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ - bool doSave = wxPyRestoreThread(); \ - int rval; \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\ - else \ - rval = PCLASS::CBNAME(a, b, c); \ - wxPySaveThread(doSave); \ - return (wxDragResult)rval; \ - } \ - wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ - return PCLASS::CBNAME(a, b, c); \ +#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ + wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + int rval=0; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ + wxPyEndBlockThreads(state); \ + if (! found) \ + rval = PCLASS::CBNAME(a, b, c); \ + return (wxDragResult)rval; \ + } \ + wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + return PCLASS::CBNAME(a, b, c); \ } //--------------------------------------------------------------------------- @@ -989,18 +1137,20 @@ public: #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ - bool doSave = wxPyRestoreThread(); \ + wxPyTState* state = wxPyBeginBlockThreads(); \ wxFSFile* rval=0; \ - if (m_myInst.findCallback(#CBNAME)) { \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro=m_myInst.callCallbackObj(Py_BuildValue("(Os)", \ - wxPyConstructObject(&a, "(wxFileSystemC"),b.c_str())); \ + PyObject* obj = wxPyMake_wxObject(&a); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)",\ + obj, b.c_str())); \ if (ro) { \ SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p"); \ Py_DECREF(ro); \ } \ - } \ - wxPySaveThread(doSave); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(state); \ return rval; \ }; @@ -1013,13 +1163,14 @@ public: #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxDragResult a) { \ - bool doSave = wxPyRestoreThread(); \ - bool rval; \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(i)", a)); \ - else \ + bool rval=FALSE; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(wxDragResult a) { \ @@ -1034,11 +1185,11 @@ public: #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ - bool doSave = wxPyRestoreThread(); \ - int rval; \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\ - wxPySaveThread(doSave); \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + int rval=0; \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ + wxPyEndBlockThreads(state); \ return (wxDragResult)rval; \ } \ @@ -1050,11 +1201,11 @@ public: #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b, const wxString& c) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));\ - wxPySaveThread(doSave); \ + bool rval=FALSE; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\ + wxPyEndBlockThreads(state); \ return rval; \ } \ @@ -1067,13 +1218,14 @@ public: #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME) \ size_t CLASS::CBNAME() { \ - size_t rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rval = m_myInst.callCallback(Py_BuildValue("()")); \ - else \ + size_t rval=0; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ return rval; \ } \ size_t CLASS::base_##CBNAME() { \ @@ -1082,28 +1234,29 @@ public: //--------------------------------------------------------------------------- -#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME) \ - wxDataFormat CBNAME(); \ - wxDataFormat base_##CBNAME(); +#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME) \ + wxDataFormat CBNAME(size_t a); \ + wxDataFormat base_##CBNAME(size_t a); #define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME) \ wxDataFormat CLASS::CBNAME(size_t a) { \ - wxDataFormat rval; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) { \ + wxDataFormat rval=0; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxDataFormat* ptr; \ - ro = m_myInst.callCallbackObj(Py_BuildValue("(i)", a)); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a)); \ if (ro) { \ if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxDataFormat_p")) \ rval = *ptr; \ Py_DECREF(ro); \ } \ } \ - else \ + wxPyEndBlockThreads(state); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ wxDataFormat CLASS::base_##CBNAME(size_t a) { \ @@ -1117,18 +1270,21 @@ public: void base_##CBNAME(const Type& a); -#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ - void CLASS::CBNAME(const Type& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject((void*)&a, #Type))); \ - else \ - PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(const Type& a) { \ - PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ + void CLASS::CBNAME(const Type& a) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(const Type& a) { \ + PCLASS::CBNAME(a); \ } @@ -1139,18 +1295,21 @@ public: void base_##CBNAME(Type& a); -#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ - void CLASS::CBNAME(Type& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject(&a, #Type))); \ - else \ - PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME(Type& a) { \ - PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ + void CLASS::CBNAME(Type& a) { \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(state); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(Type& a) { \ + PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -1160,26 +1319,116 @@ public: bool base_##CBNAME(Type& a); -#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ - bool CLASS::CBNAME(Type& a) { \ - bool rv; \ - bool doSave = wxPyRestoreThread(); \ - if (m_myInst.findCallback(#CBNAME)) \ - rv = m_myInst.callCallback(Py_BuildValue("(O)", \ - wxPyConstructObject(&a, #Type))); \ - else \ - rv = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ - return rv; \ - } \ - bool CLASS::base_##CBNAME(Type& a) { \ - return PCLASS::CBNAME(a); \ +#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ + bool CLASS::CBNAME(Type& a) { \ + bool rv; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(state); \ + if (! found) \ + rv = PCLASS::CBNAME(a); \ + return rv; \ + } \ + bool CLASS::base_##CBNAME(Type& a) { \ + return PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- -#endif +#define DEC_PYCALLBACK_STRING_LONGLONG(CBNAME) \ + wxString CBNAME(long a, long b) const; \ + wxString base_##CBNAME(long a, long b)const ; +#define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME(long a, long b) const { \ + wxString rval; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \ + if (ro) { \ + PyObject* str = PyObject_Str(ro); \ + rval = PyString_AsString(str); \ + Py_DECREF(ro); Py_DECREF(str); \ + } \ + } \ + wxPyEndBlockThreads(state); \ + if (! found) \ + rval = PCLASS::CBNAME(a,b); \ + return rval; \ + } \ + wxString CLASS::base_##CBNAME(long a, long b) const { \ + return PCLASS::CBNAME(a,b); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_INT_LONG(CBNAME) \ + int CBNAME(long a) const; \ + int base_##CBNAME(long a)const ; +#define IMP_PYCALLBACK_INT_LONG(CLASS, PCLASS, CBNAME) \ + int CLASS::CBNAME(long a) const { \ + int rval=-1; \ + bool found; \ + wxPyTState* state = 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(state); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + int CLASS::base_##CBNAME(long a) const { \ + return PCLASS::CBNAME(a); \ + } + + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME) \ + wxListItemAttr* CBNAME(long a) const; \ + wxListItemAttr* base_##CBNAME(long a); + + +#define IMP_PYCALLBACK_LISTATTR_LONG(CLASS, PCLASS, CBNAME) \ + wxListItemAttr *CLASS::CBNAME(long a) const { \ + wxListItemAttr *rval = NULL; \ + bool found; \ + wxPyTState* state = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + wxListItemAttr* ptr; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)", a)); \ + if (ro) { \ + if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxListItemAttr_p")) \ + rval = ptr; \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(state); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + wxListItemAttr *CLASS::base_##CBNAME(long a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + +#endif