X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2e1c18a79119971199b03bb14492e30dcc1c8b1..32b70aec1ff90877ae0ce2ce82967f698218fbdc:/wxPython/src/helpers.h diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index 6192e6e52c..4ec75ec534 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -15,21 +15,6 @@ #include -//---------------------------------------------------------------------- - -// if we want to handle threads and Python threads are available... -#if defined(WXP_USE_THREAD) && defined(WITH_THREAD) - -#define WXP_WITH_THREAD -#define wxPy_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS -#define wxPy_END_ALLOW_THREADS Py_END_ALLOW_THREADS - -#else // no Python threads... -#undef WXP_WITH_THREAD -#define wxPy_BEGIN_ALLOW_THREADS -#define wxPy_END_ALLOW_THREADS -#endif - //--------------------------------------------------------------------------- @@ -41,9 +26,10 @@ class wxPyApp: public wxApp public: wxPyApp(); ~wxPyApp(); - int MainLoop(void); - bool OnInit(void); + bool OnInit(); + int MainLoop(); }; + extern wxPyApp *wxPythonApp; //---------------------------------------------------------------------- @@ -52,70 +38,62 @@ 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); PyObject* wxPyConstructObject(void* ptr, - const char* className, + const wxString& className, + int setThisOwn=0); +PyObject* wxPyConstructObject(void* ptr, + const wxString& className, + PyObject* klass, int setThisOwn=0); -bool wxPyRestoreThread(); -void wxPySaveThread(bool doSave); -PyObject* wxPy_ConvertList(wxListBase* list, const char* className); -long wxPyGetWinHandle(wxWindow* win); +PyObject* wx2PyString(const wxString& src); +wxString Py2wxString(PyObject* source); +PyObject* wxPyClassExists(const wxString& className); +PyObject* wxPyMake_wxObject(wxObject* source, bool checkEvtHandler=TRUE); +PyObject* wxPyMake_wxSizer(wxSizer* source); +void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); -//---------------------------------------------------------------------- -// Handle wxInputStreams by Joerg Baumann -// See stream.i for implementations +PyObject* wxPy_ConvertList(wxListBase* list, const char* className); +long wxPyGetWinHandle(wxWindow* win); -// list class for return list of strings, e.g. readlines() -WX_DECLARE_LIST(wxString, wxStringPtrList); +//---------------------------------------------------------------------- +// if we want to handle threads and Python threads are available... +#if defined(WXP_USE_THREAD) && defined(WITH_THREAD) +#define WXP_WITH_THREAD +#else // no Python threads... +#undef WXP_WITH_THREAD +#endif -// C++ class wxPyInputStream to act as base for python class wxInputStream -// Use it in python like a python file object -class wxPyInputStream { -public: - // underlying wxInputStream - wxInputStream* wxi; -public: - wxPyInputStream(wxInputStream* wxi_) : wxi(wxi_) {} - ~wxPyInputStream(); - - // python file object interface for input files (most of it) - void close(); - void flush(); - bool eof(); - wxString* read(int size=-1); - wxString* readline(int size=-1); - wxStringPtrList* readlines(int sizehint=-1); - void seek(int offset, int whence=0); - int tell(); - /* - bool isatty(); - int fileno(); - void truncate(int size=-1); - void write(wxString data); - void writelines(wxStringPtrList); - */ -}; +// For Python --> C++ +PyThreadState* wxPyBeginAllowThreads(); +void wxPyEndAllowThreads(PyThreadState* state); +// For C++ --> Python +void wxPyBeginBlockThreads(); +void wxPyEndBlockThreads(); //---------------------------------------------------------------------- // These are helpers used by the typemaps +wxString* wxString_in_helper(PyObject* source); + 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); +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); +wxPen** wxPen_LIST_helper(PyObject* source); bool wxSize_helper(PyObject* source, wxSize** obj); bool wxPoint_helper(PyObject* source, wxPoint** obj); @@ -123,6 +101,25 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); bool wxRect_helper(PyObject* source, wxRect** obj); bool wxColour_helper(PyObject* source, wxColour** obj); +//---------------------------------------------------------------------- +// Other helpful stuff + +#if PYTHON_API_VERSION < 1009 +#define PySequence_Fast_GET_ITEM(o, i) \ + (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) +#endif + +bool _2int_seq_helper(PyObject* source, int* i1, int* i2); +bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4); + + +PyObject* wxArrayString2PyList_helper(const wxArrayString& arr); +PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr); + +#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; } +#define DECLARE_DEF_STRING(name) static const wxString wxPy##name(wx##name) +#define DECLARE_DEF_STRING2(name,val) static const wxString wxPy##name(val) + //---------------------------------------------------------------------- #ifndef SWIGCODE @@ -186,25 +183,39 @@ protected: class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { - DECLARE_DYNAMIC_CLASS(wxPyEvent) + DECLARE_ABSTRACT_CLASS(wxPyEvent) public: wxPyEvent(int id=0); + wxPyEvent(const wxPyEvent& evt); ~wxPyEvent(); - void CopyObject(wxObject& dest) const; + virtual wxEvent* Clone() const { return new wxPyEvent(*this); } }; class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef { - DECLARE_DYNAMIC_CLASS(wxPyCommandEvent) + DECLARE_ABSTRACT_CLASS(wxPyCommandEvent) public: wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0); + wxPyCommandEvent(const wxPyCommandEvent& evt); ~wxPyCommandEvent(); - void CopyObject(wxObject& dest) const; + virtual wxEvent* Clone() const { return new wxPyCommandEvent(*this); } }; + +//---------------------------------------------------------------------- +// Forward decalre a few things used in the exported API +class wxPyClientData; +class wxPyUserData; +class wxPyOORClientData; + +void wxPyClientData_dtor(wxPyClientData* self); +void wxPyUserData_dtor(wxPyUserData* self); +void wxPyOORClientData_dtor(wxPyOORClientData* self); + + //--------------------------------------------------------------------------- // 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 @@ -221,16 +232,23 @@ struct wxPyCoreAPI { void (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)); PyObject* (*p_SWIG_newvarlink)(void); - void (*p_wxPySaveThread)(bool); - bool (*p_wxPyRestoreThread)(); - PyObject* (*p_wxPyConstructObject)(void *, const char *, int); + PyThreadState* (*p_wxPyBeginAllowThreads)(); + void (*p_wxPyEndAllowThreads)(PyThreadState* state); + void (*p_wxPyBeginBlockThreads)(); + void (*p_wxPyEndBlockThreads)(); + + PyObject* (*p_wxPyConstructObject)(void *, const wxString&, int); PyObject* (*p_wxPy_ConvertList)(wxListBase* list, const char* className); + wxString* (*p_wxString_in_helper)(PyObject* source); + wxString (*p_Py2wxString)(PyObject* source); + PyObject* (*p_wx2PyString)(const wxString& src); + 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); + 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); @@ -241,17 +259,81 @@ struct wxPyCoreAPI { 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); + void (*p_wxPyCBH_setCallbackInfo)(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 wxString& className); + PyObject* (*p_wxPyMake_wxObject)(wxObject* source, bool checkEvtHandler); + PyObject* (*p_wxPyMake_wxSizer)(wxSizer* source); + void (*p_wxPyPtrTypeMap_Add)(const char* commonName, const char* ptrName); + PyObject* (*p_wxArrayString2PyList_helper)(const wxArrayString& arr); + PyObject* (*p_wxArrayInt2PyList_helper)(const wxArrayInt& arr); + + void (*p_wxPyClientData_dtor)(wxPyClientData*); + void (*p_wxPyUserData_dtor)(wxPyUserData*); + void (*p_wxPyOORClientData_dtor)(wxPyOORClientData*); +}; + +#ifdef wxPyUSE_EXPORT +static wxPyCoreAPI* wxPyCoreAPIPtr = NULL; // Each module needs one, but doesn't have to use it. +#endif + + +//--------------------------------------------------------------------------- + + +class wxPyUserData : public wxObject { +public: + wxPyUserData(PyObject* obj) { + m_obj = obj; + Py_INCREF(m_obj); + } + + ~wxPyUserData() { +#ifdef wxPyUSE_EXPORT + wxPyCoreAPIPtr->p_wxPyUserData_dtor(this); +#else + wxPyUserData_dtor(this); +#endif + } + PyObject* m_obj; +}; + + +class wxPyClientData : public wxClientData { +public: + wxPyClientData(PyObject* obj) { + m_obj = obj; + Py_INCREF(m_obj); + } + + ~wxPyClientData() { +#ifdef wxPyUSE_EXPORT + wxPyCoreAPIPtr->p_wxPyClientData_dtor(this); +#else + wxPyClientData_dtor(this); +#endif + } + PyObject* m_obj; }; + +class wxPyOORClientData : public wxPyClientData { +public: + wxPyOORClientData(PyObject* obj) + : wxPyClientData(obj) {} + + ~wxPyOORClientData() { #ifdef wxPyUSE_EXPORT -static wxPyCoreAPI* wxPyCoreAPIPtr = NULL; // Each module needs one, but may not use it. + wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this); +#else + wxPyOORClientData_dtor(this); #endif + } +}; //--------------------------------------------------------------------------- // This class holds an instance of a Python Shadow Class object and assists @@ -295,7 +377,7 @@ private: }; -void wxPyCBH_setSelf(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref); +void wxPyCBH_setCallbackInfo(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); @@ -303,31 +385,6 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); -//---------------------------------------------------------------------- - -class wxPyUserData : public wxObject { -public: - wxPyUserData(PyObject* obj) { - m_obj = obj; - Py_INCREF(m_obj); - } - - ~wxPyUserData() { - bool doSave; -#ifdef wxPyUSE_EXPORT - doSave = wxPyCoreAPIPtr->p_wxPyRestoreThread(); - Py_DECREF(m_obj); - wxPyCoreAPIPtr->p_wxPySaveThread(doSave); -#else - doSave = wxPyRestoreThread(); - Py_DECREF(m_obj); - wxPySaveThread(doSave); -#endif - } - PyObject* m_obj; -}; - - //--------------------------------------------------------------------------- // These macros are used to implement the virtual methods that should @@ -336,8 +393,8 @@ public: //--------------------------------------------------------------------------- #define PYPRIVATE \ - void _setSelf(PyObject* self, PyObject* _class, int incref=1) { \ - wxPyCBH_setSelf(m_myInst, self, _class, incref); \ + void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1) { \ + wxPyCBH_setCallbackInfo(m_myInst, self, _class, incref); \ } \ private: wxPyCallbackHelper m_myInst @@ -348,17 +405,18 @@ public: void base_##CBNAME(); -#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME() { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - else \ - PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ - } \ - void CLASS::base_##CBNAME() { \ - PCLASS::CBNAME(); \ +#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME() { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(); \ + } \ + void CLASS::base_##CBNAME() { \ + PCLASS::CBNAME(); \ } //--------------------------------------------------------------------------- @@ -370,13 +428,13 @@ public: #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + bool rval=FALSE, found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - else \ + wxPyEndBlockThreads(); \ + if (! found) \ rval = PCLASS::CBNAME(a,b); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(int a, int b) { \ @@ -392,12 +450,13 @@ public: #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(int a, int b) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ - else \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ + wxPyEndBlockThreads(); \ + if (! found) \ PCLASS::CBNAME(a,b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(int a, int b) { \ PCLASS::CBNAME(a,b); \ @@ -412,13 +471,13 @@ public: #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ - else \ + bool rval=FALSE, 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); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(int a) { \ @@ -433,12 +492,12 @@ public: #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + bool rval=FALSE; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ else rval = FALSE; \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } @@ -450,20 +509,21 @@ public: void base_##CBNAME(wxDC& a); -#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(wxDC& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ - Py_DECREF(obj); \ - } \ - 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; \ + 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(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(wxDC& a) { \ + PCLASS::CBNAME(a); \ } @@ -477,15 +537,16 @@ public: #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + if (! found) \ PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, bool b) { \ PCLASS::CBNAME(a, b); \ @@ -500,15 +561,16 @@ public: #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a, bool b) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + if (! found) \ PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ } \ void CLASS::base_##CBNAME(wxDC& a, bool b) { \ PCLASS::CBNAME(a, b); \ @@ -521,17 +583,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, 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; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a, b); \ + } \ + void CLASS::base_##CBNAME(double a, double b) { \ + PCLASS::CBNAME(a, b); \ } //--------------------------------------------------------------------------- @@ -543,13 +606,14 @@ public: #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(double a, double b, int c, int d) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ a,b,c,d)); \ - else \ + wxPyEndBlockThreads(); \ + 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); \ @@ -557,22 +621,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + 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); \ @@ -587,16 +652,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + 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) {\ @@ -612,13 +678,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \ (int)a,b,c,d,e)); \ - else \ + wxPyEndBlockThreads(); \ + 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); \ @@ -626,22 +693,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + 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); \ @@ -654,20 +722,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(&a, "wxDC", 0); \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ - Py_DECREF(obj); \ - } \ - 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; \ + 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(); \ + if (! found) \ + PCLASS::CBNAME(a, b); \ + } \ + void CLASS::base_##CBNAME(wxDC& a, bool b) { \ + PCLASS::CBNAME(a, b); \ } //--------------------------------------------------------------------------- @@ -680,15 +749,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(a, "wxPyControlPoint", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + 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) { \ @@ -704,15 +774,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject(a, "wxPyControlPoint", 0); \ + bool found; \ + 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); \ } \ - else \ + wxPyEndBlockThreads(); \ + 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) { \ @@ -726,17 +797,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, 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; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a, b, c); \ + } \ + void CLASS::base_##CBNAME(double a, double b, int c) { \ + PCLASS::CBNAME(a, b, c); \ } //--------------------------------------------------------------------------- @@ -748,12 +820,13 @@ public: #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(bool a, double b, double c, int d) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d)); \ - else \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\ + wxPyEndBlockThreads(); \ + 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); \ @@ -766,18 +839,18 @@ public: void CBNAME(const wxString& a); \ void base_##CBNAME(const wxString& a); - -#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ - void CLASS::CBNAME(const wxString& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, 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; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a))); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(const wxString& a) { \ + PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -786,16 +859,16 @@ public: bool CBNAME(const wxString& a); \ bool base_##CBNAME(const wxString& a); - #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \ - else \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a)));\ + wxPyEndBlockThreads(); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(const wxString& a) { \ @@ -806,16 +879,16 @@ 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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, 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; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", wx2PyString(a))); \ + wxPyEndBlockThreads(); \ + return rval; \ + } \ //--------------------------------------------------------------------------- @@ -825,17 +898,16 @@ public: #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(s)", a.c_str())); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", wx2PyString(a)));\ if (ro) { \ - PyObject* str = PyObject_Str(ro); \ - rval = PyString_AsString(str); \ - Py_DECREF(ro); Py_DECREF(str); \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } \ @@ -847,17 +919,16 @@ public: #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(si)", a.c_str(),b)); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)", wx2PyString(a),b)); \ if (ro) { \ - PyObject* str = PyObject_Str(ro); \ - rval = PyString_AsString(str); \ - Py_DECREF(ro); Py_DECREF(str); \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } \ @@ -867,17 +938,17 @@ public: bool CBNAME(const wxString& a, const wxString& b); \ bool base_##CBNAME(const wxString& a, const wxString& b); - #define IMP_PYCALLBACK_BOOL_STRINGSTRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ss)", \ - a.c_str(), b.c_str())); \ - else \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", \ + wx2PyString(a), wx2PyString(b))); \ + wxPyEndBlockThreads(); \ + if (! found) \ rval = PCLASS::CBNAME(a, b); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) { \ @@ -890,23 +961,22 @@ public: wxString CBNAME(); \ wxString base_##CBNAME(); - #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ - PyObject* str = PyObject_Str(ro); \ - rval = PyString_AsString(str); \ - Py_DECREF(ro); Py_DECREF(str); \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ } \ } \ - else \ + wxPyEndBlockThreads(); \ + if (! found) \ rval = PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ return rval; \ } \ wxString CLASS::base_##CBNAME() { \ @@ -918,21 +988,19 @@ public: #define DEC_PYCALLBACK_STRING__pure(CBNAME) \ wxString CBNAME(); - #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ wxString rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ - PyObject* str = PyObject_Str(ro); \ - rval = PyString_AsString(str); \ - Py_DECREF(ro); Py_DECREF(str); \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } @@ -944,17 +1012,68 @@ public: #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ - bool rval = FALSE; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a,"wxHtmlTag", 0); \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ + bool rval=FALSE; \ + 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); \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK__CELLINTINT(CBNAME) \ + void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y); \ + void base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y); + +#define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0); \ + wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(cell, x, y); \ + } \ + void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ + 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 IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0); \ + PyObject* o2 = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \ + wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2)); \ + Py_DECREF(obj); \ + Py_DECREF(o2); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(cell, x, y, e); \ + } \ + void CLASS::base_##CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ + PCLASS::CBNAME(cell, x, y, e); \ + } + + + //--------------------------------------------------------------------------- #define DEC_PYCALLBACK___pure(CBNAME) \ @@ -963,10 +1082,10 @@ public: #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPySaveThread(doSave); \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(); \ } //--------------------------------------------------------------------------- @@ -977,19 +1096,33 @@ public: #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ wxSize CLASS::CBNAME() { \ + const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \ wxSize rval(0,0); \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ wxSize* ptr; \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ if (ro) { \ if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) \ rval = *ptr; \ + else if (PySequence_Check(ro) && PyObject_Length(ro) == 2) { \ + PyObject* o1 = PySequence_GetItem(ro, 0); \ + PyObject* o2 = PySequence_GetItem(ro, 1); \ + if (PyNumber_Check(o1) && PyNumber_Check(o2)) \ + rval = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2)); \ + else \ + PyErr_SetString(PyExc_TypeError, errmsg); \ + Py_DECREF(o1); \ + Py_DECREF(o2); \ + } \ + else { \ + PyErr_SetString(PyExc_TypeError, errmsg); \ + } \ Py_DECREF(ro); \ } \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ } @@ -1000,22 +1133,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)a,"wxWindow", 0);\ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ - Py_DECREF(obj); \ - } \ - 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; \ + 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(); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxWindow* a) { \ + return PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -1025,41 +1159,43 @@ public: bool base_##CBNAME(); -#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME() { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, 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; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(); \ + 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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ +#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ + wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + int rval=0; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ rval = wxPyCBH_callCallback(m_myInst, 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); \ + wxPyEndBlockThreads(); \ + 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); \ } //--------------------------------------------------------------------------- @@ -1069,20 +1205,20 @@ public: #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ - bool doSave = wxPyRestoreThread(); \ + wxPyBeginBlockThreads(); \ wxFSFile* rval=0; \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ PyObject* ro; \ - PyObject* obj = wxPyConstructObject(&a, "wxFileSystem", 0); \ - ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)", \ - obj, b.c_str())); \ + PyObject* obj = wxPyMake_wxObject(&a); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\ + obj, wx2PyString(b))); \ if (ro) { \ SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p"); \ Py_DECREF(ro); \ } \ Py_DECREF(obj); \ } \ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return rval; \ }; @@ -1095,13 +1231,14 @@ public: #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxDragResult a) { \ - bool doSave = wxPyRestoreThread(); \ - bool rval; \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ - else \ + 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); \ - wxPySaveThread(doSave); \ return rval; \ } \ bool CLASS::base_##CBNAME(wxDragResult a) { \ @@ -1116,11 +1253,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + wxPyBeginBlockThreads(); \ + int rval=0; \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ - wxPySaveThread(doSave); \ + wxPyEndBlockThreads(); \ return (wxDragResult)rval; \ } \ @@ -1129,14 +1266,13 @@ public: #define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME) \ bool CBNAME(int a, int b, const wxString& c); - #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(int a, int b, const wxString& c) { \ - bool rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\ - wxPySaveThread(doSave); \ + bool rval=FALSE; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b, wx2PyString(c)));\ + wxPyEndBlockThreads(); \ return rval; \ } \ @@ -1149,13 +1285,14 @@ public: #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME) \ size_t CLASS::CBNAME() { \ - size_t rval; \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - else \ + size_t rval=0; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ + wxPyEndBlockThreads(); \ + if (! found) \ rval = PCLASS::CBNAME(); \ - wxPySaveThread(doSave); \ return rval; \ } \ size_t CLASS::base_##CBNAME() { \ @@ -1164,28 +1301,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + wxDataFormat rval=0; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ wxDataFormat* ptr; \ - ro = wxPyCBH_callCallbackObj(m_myInst, 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(); \ + if (! found) \ rval = PCLASS::CBNAME(a); \ - wxPySaveThread(doSave); \ return rval; \ } \ wxDataFormat CLASS::base_##CBNAME(size_t a) { \ @@ -1199,20 +1337,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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ - Py_DECREF(obj); \ - } \ - 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; \ + 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(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(const Type& a) { \ + PCLASS::CBNAME(a); \ } @@ -1223,20 +1362,21 @@ public: void base_##CBNAME(Type& a); -#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ - void CLASS::CBNAME(Type& a) { \ - bool doSave = wxPyRestoreThread(); \ - if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ - wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ - Py_DECREF(obj); \ - } \ - 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; \ + 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(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(Type& a) { \ + PCLASS::CBNAME(a); \ } //--------------------------------------------------------------------------- @@ -1246,28 +1386,145 @@ 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 (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ - rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ - Py_DECREF(obj); \ - } \ - 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=FALSE; \ + bool found; \ + 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(); \ + 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; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + 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; \ + 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(); \ + 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; \ + 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(); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + wxListItemAttr *CLASS::base_##CBNAME(long a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \ + bool CBNAME(wxMouseEvent& e); \ + bool base_##CBNAME(wxMouseEvent& e); + +#define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxMouseEvent& e) { \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + PyObject* obj = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \ + if (ro) { \ + rval = PyInt_AsLong(ro); \ + Py_DECREF(ro); \ + } \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + return PCLASS::CBNAME(e); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxMouseEvent& e) { \ + return PCLASS::CBNAME(e); \ + } + + +//--------------------------------------------------------------------------- + +#endif