X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/628c7f79d4f177b18349c9c10d49db6c9c4bc56c..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/src/helpers.h diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index 9cf9014612..17c73fae13 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -14,27 +14,13 @@ #define __wxp_helpers__ #include - +#include //--------------------------------------------------------------------------- typedef unsigned char byte; - -class wxPyApp: public wxApp -{ -public: - wxPyApp(); - ~wxPyApp(); - bool OnInit(); - int MainLoop(); -}; - -extern wxPyApp *wxPythonApp; - -//---------------------------------------------------------------------- - -void __wxPreStart(); +void __wxPreStart(PyObject*); PyObject* __wxStart(PyObject*, PyObject* args); void __wxCleanup(); @@ -62,6 +48,9 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); PyObject* wxPy_ConvertList(wxListBase* list, const char* className); long wxPyGetWinHandle(wxWindow* win); +void wxPy_ReinitStockObjects(); + + //---------------------------------------------------------------------- // if we want to handle threads and Python threads are available... @@ -80,6 +69,8 @@ void wxPyEndAllowThreads(PyThreadState* state); void wxPyBeginBlockThreads(); void wxPyEndBlockThreads(); +#define wxPyBLOCK_THREADS(stmt) wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads() + //---------------------------------------------------------------------- // These are helpers used by the typemaps @@ -101,6 +92,9 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); bool wxRect_helper(PyObject* source, wxRect** obj); bool wxColour_helper(PyObject* source, wxColour** obj); +bool wxPoint2DDouble_helper(PyObject* source, wxPoint2DDouble** obj); + + //---------------------------------------------------------------------- // Other helpful stuff @@ -109,8 +103,8 @@ bool wxColour_helper(PyObject* source, wxColour** obj); (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); +bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2); +bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4); PyObject* wxArrayString2PyList_helper(const wxArrayString& arr); @@ -120,6 +114,21 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr); #define DECLARE_DEF_STRING(name) static const wxString wxPy##name(wx##name) #define DECLARE_DEF_STRING2(name,val) static const wxString wxPy##name(val) +//---------------------------------------------------------------------- +// functions used by the DrawXXXList enhancements added to wxDC + +typedef bool (*wxPyDrawListOp_t)(wxDC& dc, PyObject* coords); +PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw, + PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes); +bool wxPyDrawXXXPoint(wxDC& dc, PyObject* coords); +bool wxPyDrawXXXLine(wxDC& dc, PyObject* coords); +bool wxPyDrawXXXRectangle(wxDC& dc, PyObject* coords); +bool wxPyDrawXXXEllipse(wxDC& dc, PyObject* coords); +bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords); + +PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, + PyObject* foregroundList, PyObject* backgroundList); + //---------------------------------------------------------------------- #ifndef SWIGCODE @@ -175,6 +184,7 @@ public: void SetSelf(PyObject* self, bool clone=FALSE); PyObject* GetSelf() const; + bool GetCloned() const { return m_cloned; } protected: PyObject* m_self; @@ -185,7 +195,7 @@ protected: class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { DECLARE_ABSTRACT_CLASS(wxPyEvent) public: - wxPyEvent(int id=0); + wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL); wxPyEvent(const wxPyEvent& evt); ~wxPyEvent(); @@ -270,6 +280,7 @@ struct wxPyCoreAPI { bool (*p_wxRealPoint_helper)(PyObject* source, wxRealPoint** obj); bool (*p_wxRect_helper)(PyObject* source, wxRect** obj); bool (*p_wxColour_helper)(PyObject* source, wxColour** obj); + bool (*p_wxPoint2DDouble_helper)(PyObject* source, wxPoint2DDouble** obj); void (*p_wxPyCBH_setCallbackInfo)(wxPyCallbackHelper& cbh, PyObject* self, PyObject* klass, int incref); bool (*p_wxPyCBH_findCallback)(const wxPyCallbackHelper& cbh, const char* name); @@ -404,31 +415,90 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- -// These macros are used to implement the virtual methods that should -// redirect to a Python method if one exists. The names designate the -// return type, if any, as well as any parameter types. -//--------------------------------------------------------------------------- -#define PYPRIVATE \ +// This is used in C++ classes that need to be able to make callback to +// "overloaded" python methods + +#define PYPRIVATE \ void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1) { \ wxPyCBH_setCallbackInfo(m_myInst, self, _class, incref); \ - } \ + } \ private: wxPyCallbackHelper m_myInst + +//--------------------------------------------------------------------------- + +enum { + wxPYAPP_ASSERT_SUPPRESS = 1, + wxPYAPP_ASSERT_EXCEPTION = 2, + wxPYAPP_ASSERT_DIALOG = 4, + wxPYAPP_ASSERT_LOG = 8 +}; + +class wxPyApp: public wxApp +{ + DECLARE_ABSTRACT_CLASS(wxPyApp); + +public: + wxPyApp(); + ~wxPyApp(); + bool OnInit(); + int MainLoop(); + + int GetAssertMode() { return m_assertMode; } + void SetAssertMode(int mode) { m_assertMode = mode; } + + virtual bool OnInitGui(); + virtual int OnExit(); +#ifdef __WXDEBUG__ + virtual void OnAssert(const wxChar *file, + int line, + const wxChar *cond, + const wxChar *msg); +#endif + // virtual int FilterEvent(wxEvent& event); // This one too???? + + + static bool GetMacDefaultEncodingIsPC(); + static bool GetMacSupportPCMenuShortcuts(); + static long GetMacAboutMenuItemId(); + static long GetMacPreferencesMenuItemId(); + static long GetMacExitMenuItemId(); + static wxString GetMacHelpMenuTitleName(); + + static void SetMacDefaultEncodingIsPC(bool val); + static void SetMacSupportPCMenuShortcuts(bool val); + static void SetMacAboutMenuItemId(long val); + static void SetMacPreferencesMenuItemId(long val); + static void SetMacExitMenuItemId(long val); + static void SetMacHelpMenuTitleName(const wxString& val); + + + PYPRIVATE; + int m_assertMode; +}; + +extern wxPyApp *wxPythonApp; + + +//---------------------------------------------------------------------- +// These macros are used to implement the virtual methods that should +// redirect to a Python method if one exists. The names designate the +// return type, if any, as well as any parameter types. //--------------------------------------------------------------------------- #define DEC_PYCALLBACK__(CBNAME) \ void CBNAME(); \ - void base_##CBNAME(); + void base_##CBNAME() #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME() { \ bool found; \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ PCLASS::CBNAME(); \ } \ @@ -440,7 +510,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_INTINT(CBNAME) \ bool CBNAME(int a, int b); \ - bool base_##CBNAME(int a, int b); + bool base_##CBNAME(int a, int b) #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ @@ -460,9 +530,30 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_VOID_(CBNAME) \ + void CBNAME(); \ + void base_##CBNAME() + + +#define IMP_PYCALLBACK_VOID_(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(); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_INTINT(CBNAME) \ void CBNAME(int a, int b); \ - void base_##CBNAME(int a, int b); + void base_##CBNAME(int a, int b) #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ @@ -481,9 +572,30 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_VOID_INT(CBNAME) \ + void CBNAME(int a); \ + void base_##CBNAME(int a) + + +#define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(int a) { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a); \ + } \ + void CLASS::base_##CBNAME(int a) { \ + PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_INT4(CBNAME) \ void CBNAME(int a, int b, int c, int d); \ - void base_##CBNAME(int a, int b, int c, int d); + void base_##CBNAME(int a, int b, int c, int d) #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \ @@ -503,7 +615,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_VOID_INT5(CBNAME) \ void CBNAME(int a, int b, int c, int d, int e); \ - void base_##CBNAME(int a, int b, int c, int d, int e); + void base_##CBNAME(int a, int b, int c, int d, int e) #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \ @@ -524,7 +636,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_VOID_INTPINTP_const(CBNAME) \ void CBNAME(int* a, int* b) const; \ - void base_##CBNAME(int* a, int* b) const; + void base_##CBNAME(int* a, int* b) const #define IMP_PYCALLBACK_VOID_INTPINTP_const(CLASS, PCLASS, CBNAME) \ @@ -566,7 +678,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_SIZE_const(CBNAME) \ wxSize CBNAME() const; \ - wxSize base_##CBNAME() const; + wxSize base_##CBNAME() const #define IMP_PYCALLBACK_SIZE_const(CLASS, PCLASS, CBNAME) \ @@ -608,9 +720,31 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_BOOL_BOOL(CBNAME) \ + bool CBNAME(bool a); \ + bool base_##CBNAME(bool a) + + +#define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(bool a) { \ + 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); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(bool a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_BOOL_INT(CBNAME) \ bool CBNAME(int a); \ - bool base_##CBNAME(int a); + bool base_##CBNAME(int a) #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ @@ -631,7 +765,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_INT_pure(CBNAME) \ - bool CBNAME(int a); + bool CBNAME(int a) #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ @@ -650,19 +784,19 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__DC(CBNAME) \ void CBNAME(wxDC& a); \ - void base_##CBNAME(wxDC& a); + void base_##CBNAME(wxDC& a) #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(wxDC& a) { \ bool found; \ - wxPyBeginBlockThreads(); \ + wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* obj = wxPyMake_wxObject(&a); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ - wxPyEndBlockThreads(); \ + wxPyEndBlockThreads(); \ if (! found) \ PCLASS::CBNAME(a); \ } \ @@ -676,7 +810,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -700,7 +834,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -724,7 +858,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__2DBL(CBNAME) \ void CBNAME(double a, double b); \ - void base_##CBNAME(double a, double b); + void base_##CBNAME(double a, double b) #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ @@ -745,7 +879,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__2DBL2INT(CBNAME) \ void CBNAME(double a, double b, int c, int d); \ - void base_##CBNAME(double a, double b, int c, int d); + void base_##CBNAME(double a, double b, int c, int d) #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -767,7 +901,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #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); + void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ @@ -791,7 +925,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_DC4DBLBOOL(CBNAME) \ bool CBNAME(wxDC& a, double b, double c, double d, double e, bool f); \ - bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f); + bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ @@ -817,7 +951,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__BOOL2DBL2INT(CBNAME) \ void CBNAME(bool a, double b, double c, int d, int e); \ - void base_##CBNAME(bool a, double b, double c, int d, int e); + void base_##CBNAME(bool a, double b, double c, int d, int e) #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -839,7 +973,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #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); + void base_##CBNAME(wxDC& a, double b, double c, double d, double e) #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \ @@ -863,7 +997,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__DCBOOL(CBNAME) \ void CBNAME(wxDC& a, bool b); \ - void base_##CBNAME(wxDC& a, bool b); + void base_##CBNAME(wxDC& a, bool b) #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ @@ -887,7 +1021,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__WXCPBOOL2DBL2INT(CBNAME) \ void CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f); \ - void base_##CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f); + void base_##CBNAME(wxControlPoint* a, bool b, double c, double d, int e, int f) #define IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -913,7 +1047,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__WXCP2DBL2INT(CBNAME) \ void CBNAME(wxControlPoint* a, double b, double c, int d, int e); \ - void base_##CBNAME(wxControlPoint* a, double b, double c, int d, int e); + void base_##CBNAME(wxControlPoint* a, double b, double c, int d, int e) #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \ @@ -938,7 +1072,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__2DBLINT(CBNAME) \ void CBNAME(double a, double b, int c); \ - void base_##CBNAME(double a, double b, int c); + void base_##CBNAME(double a, double b, int c) #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ @@ -959,7 +1093,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__BOOL2DBLINT(CBNAME) \ void CBNAME(bool a, double b, double c, int d); \ - void base_##CBNAME(bool a, double b, double c, int d); + void base_##CBNAME(bool a, double b, double c, int d) #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ @@ -981,7 +1115,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__STRING(CBNAME) \ void CBNAME(const wxString& a); \ - void base_##CBNAME(const wxString& a); + void base_##CBNAME(const wxString& a) #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ void CLASS::CBNAME(const wxString& a) { \ @@ -1004,7 +1138,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_STRING(CBNAME) \ bool CBNAME(const wxString& a); \ - bool base_##CBNAME(const wxString& a); + bool base_##CBNAME(const wxString& a) #define IMP_PYCALLBACK_BOOL_STRING(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ @@ -1028,7 +1162,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_STRING_pure(CBNAME) \ - bool CBNAME(const wxString& a); + bool CBNAME(const wxString& a) #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxString& a) { \ @@ -1046,7 +1180,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_STRING_STRING_pure(CBNAME) \ - wxString CBNAME(const wxString& a); \ + wxString CBNAME(const wxString& a) #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a) { \ @@ -1068,8 +1202,35 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_STRING_STRING(CBNAME) \ + wxString CBNAME(const wxString& a); \ + wxString base_##CBNAME(const wxString& a) + +#define IMP_PYCALLBACK_STRING_STRING(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME(const wxString& a) { \ + wxString rval; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + PyObject* s = wx2PyString(a); \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", s)); \ + Py_DECREF(s); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + wxPyEndBlockThreads(); \ + return rval; \ + } \ + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_STRING_STRINGINT_pure(CBNAME) \ - wxString CBNAME(const wxString& a,int b); \ + wxString CBNAME(const wxString& a,int b) #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME(const wxString& a,int b) { \ @@ -1093,7 +1254,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME) \ bool CBNAME(const wxString& a, const wxString& b); \ - bool base_##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) { \ @@ -1120,7 +1281,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_STRING_(CBNAME) \ wxString CBNAME(); \ - wxString base_##CBNAME(); + wxString base_##CBNAME() #define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ @@ -1146,8 +1307,36 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_STRING__const(CBNAME) \ + wxString CBNAME() const; \ + wxString base_##CBNAME() const; + +#define IMP_PYCALLBACK_STRING__const(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME() const { \ + wxString rval; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(); \ + return rval; \ + } \ + wxString CLASS::base_##CBNAME() const { \ + return PCLASS::CBNAME(); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_STRING__pure(CBNAME) \ - wxString CBNAME(); + wxString CBNAME() #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ wxString CLASS::CBNAME() { \ @@ -1167,8 +1356,29 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_STRING__constpure(CBNAME) \ + wxString CBNAME() const; + +#define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME() const { \ + wxString rval; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + return rval; \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_BOOL_TAG_pure(CBNAME) \ - bool CBNAME(const wxHtmlTag& a); \ + bool CBNAME(const wxHtmlTag& a) #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ @@ -1176,7 +1386,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool rval=FALSE; \ wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, "wxHtmlTag", 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1188,14 +1398,14 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__CELLINTINT(CBNAME) \ void CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y); \ - void base_##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); \ + PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y)); \ Py_DECREF(obj); \ } \ @@ -1212,15 +1422,15 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #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); + 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); \ + PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ + PyObject* o2 = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OiiO)",obj,x,y,o2)); \ Py_DECREF(obj); \ Py_DECREF(o2); \ @@ -1238,7 +1448,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK___pure(CBNAME) \ - void CBNAME(); \ + void CBNAME() #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ @@ -1252,7 +1462,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_wxSize__pure(CBNAME) \ - wxSize CBNAME(); \ + wxSize CBNAME() #define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ @@ -1291,7 +1501,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_WXWIN(CBNAME) \ bool CBNAME(wxWindow* a); \ - bool base_##CBNAME(wxWindow* a); + bool base_##CBNAME(wxWindow* a) #define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ @@ -1315,9 +1525,37 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_BOOL_WXWINDC(CBNAME) \ + bool CBNAME(wxWindow* a, wxDC& b); \ + bool base_##CBNAME(wxWindow* a, wxDC& b) + + +#define IMP_PYCALLBACK_BOOL_WXWINDC(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxWindow* a, wxDC& b) { \ + bool rval=FALSE; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* win = wxPyMake_wxObject(a); \ + PyObject* dc = wxPyMake_wxObject(&b); \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\ + Py_DECREF(win); \ + Py_DECREF(dc); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(a, b); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxWindow* a, wxDC& b) { \ + return PCLASS::CBNAME(a, b); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_VOID_WXWINBASE(CBNAME) \ void CBNAME(wxWindowBase* a); \ - void base_##CBNAME(wxWindowBase* a); + void base_##CBNAME(wxWindowBase* a) #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \ @@ -1341,7 +1579,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_(CBNAME) \ bool CBNAME(); \ - bool base_##CBNAME(); + bool base_##CBNAME() #define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ @@ -1364,7 +1602,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_const(CBNAME) \ bool CBNAME() const; \ - bool base_##CBNAME() const; + bool base_##CBNAME() const #define IMP_PYCALLBACK_BOOL_const(CLASS, PCLASS, CBNAME) \ @@ -1387,7 +1625,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_DR_2WXCDR(CBNAME) \ wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); \ - wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def); + wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def) #define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ @@ -1409,7 +1647,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_FSF_FSSTRING_pure(CBNAME) \ - wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location); \ + wxFSFile* CBNAME(wxFileSystem& fs, const wxString& location) #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ @@ -1436,7 +1674,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_DR(CBNAME) \ bool CBNAME(wxDragResult a); \ - bool base_##CBNAME(wxDragResult a); + bool base_##CBNAME(wxDragResult a) #define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ @@ -1458,7 +1696,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_DR_2WXCDR_pure(CBNAME) \ - wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); + wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def) #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ @@ -1474,7 +1712,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BOOL_INTINTSTR_pure(CBNAME) \ - bool CBNAME(int a, int b, const wxString& c); + 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) { \ @@ -1493,7 +1731,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_SIZET_(CBNAME) \ size_t CBNAME(); \ - size_t base_##CBNAME(); + size_t base_##CBNAME() #define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME) \ @@ -1516,7 +1754,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME) \ wxDataFormat CBNAME(size_t a); \ - wxDataFormat base_##CBNAME(size_t a); + wxDataFormat base_##CBNAME(size_t a) #define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME) \ @@ -1547,7 +1785,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__constany(CBNAME, Type) \ void CBNAME(const Type& a); \ - void base_##CBNAME(const Type& a); + void base_##CBNAME(const Type& a) #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ @@ -1555,7 +1793,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool found; \ wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1572,7 +1810,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK__any(CBNAME, Type) \ void CBNAME(Type& a); \ - void base_##CBNAME(Type& a); + void base_##CBNAME(Type& a) #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ @@ -1580,7 +1818,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool found; \ wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1596,7 +1834,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_bool_any(CBNAME, Type) \ bool CBNAME(Type& a); \ - bool base_##CBNAME(Type& a); + bool base_##CBNAME(Type& a) #define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \ @@ -1605,7 +1843,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool found; \ wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1621,7 +1859,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_bool_anypure(CBNAME, Type) \ - bool CBNAME(Type& a); + bool CBNAME(Type& a) #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ @@ -1629,7 +1867,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool rv=FALSE; \ wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \ + PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1641,7 +1879,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_STRING_LONGLONG(CBNAME) \ wxString CBNAME(long a, long b) const; \ - wxString base_##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 { \ @@ -1669,7 +1907,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_INT_LONG(CBNAME) \ int CBNAME(long a) const; \ - int base_##CBNAME(long a)const ; + int base_##CBNAME(long a) const #define IMP_PYCALLBACK_INT_LONG(CLASS, PCLASS, CBNAME) \ @@ -1699,7 +1937,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME) \ wxListItemAttr* CBNAME(long a) const; \ - wxListItemAttr* base_##CBNAME(long a); + wxListItemAttr* base_##CBNAME(long a) const #define IMP_PYCALLBACK_LISTATTR_LONG(CLASS, PCLASS, CBNAME) \ @@ -1722,7 +1960,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); rval = PCLASS::CBNAME(a); \ return rval; \ } \ - wxListItemAttr *CLASS::base_##CBNAME(long a) { \ + wxListItemAttr *CLASS::base_##CBNAME(long a) const { \ return PCLASS::CBNAME(a); \ } @@ -1730,7 +1968,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); #define DEC_PYCALLBACK_BOOL_ME(CBNAME) \ bool CBNAME(wxMouseEvent& e); \ - bool base_##CBNAME(wxMouseEvent& e); + bool base_##CBNAME(wxMouseEvent& e) #define IMP_PYCALLBACK_BOOL_ME(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxMouseEvent& e) { \ @@ -1739,7 +1977,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* ro; \ - PyObject* obj = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \ + PyObject* obj = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \ if (ro) { \ rval = PyInt_AsLong(ro); \ @@ -1760,7 +1998,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_WIZPG__pure(CBNAME) \ - wxWizardPage* CBNAME() const; + wxWizardPage* CBNAME() const #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \ wxWizardPage* CLASS::CBNAME() const { \ @@ -1781,7 +2019,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_BITMAP__pure(CBNAME) \ - wxBitmap CBNAME() const; + wxBitmap CBNAME() const #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \ wxBitmap CLASS::CBNAME() const { \ @@ -1804,7 +2042,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- #define DEC_PYCALLBACK_OBJECT__pure(CBNAME) \ - wxObject* CBNAME(); + wxObject* CBNAME() #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \ wxObject* CLASS::CBNAME() { \ @@ -1824,8 +2062,31 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_OBJECT_STRING_pure(CBNAME) \ + wxObject* CBNAME(const wxString& a) + +#define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \ + wxObject* CLASS::CBNAME(const wxString& a) { \ + wxObject* rv = NULL; \ + wxPyBeginBlockThreads(); \ + if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ + PyObject* so = wx2PyString(a); \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", so)); \ + if (ro) { \ + SWIG_GetPtrObj(ro, (void **)&rv, "_wxObject_p"); \ + Py_DECREF(ro); \ + } \ + Py_DECREF(so); \ + } \ + wxPyEndBlockThreads(); \ + return rv; \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_BOOL_NODE_pure(CBNAME) \ - bool CBNAME(wxXmlNode* a); + bool CBNAME(wxXmlNode* a) #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \ @@ -1833,7 +2094,7 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); bool rv=FALSE; \ wxPyBeginBlockThreads(); \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ - PyObject* obj = wxPyConstructObject((void*)a, "wxXmlNode", 0); \ + PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ Py_DECREF(obj); \ } \ @@ -1842,4 +2103,162 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh); } \ //--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_COORD_SIZET_constpure(CBNAME) \ + wxCoord CBNAME(size_t a) const + + +#define IMP_PYCALLBACK_COORD_SIZET_constpure(CLASS, PCLASS, CBNAME) \ + wxCoord CLASS::CBNAME(size_t a) const { \ + wxCoord rval=0; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ + } \ + wxPyEndBlockThreads(); \ + return rval; \ + } \ + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_VOID_SIZETSIZET_const(CBNAME) \ + void CBNAME(size_t a, size_t b) const; \ + void base_##CBNAME(size_t a, size_t b) const + + +#define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(size_t a, size_t b) const { \ + 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); \ + } \ + void CLASS::base_##CBNAME(size_t a, size_t b) const { \ + PCLASS::CBNAME(a,b); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_COORD_const(CBNAME) \ + wxCoord CBNAME() const; \ + wxCoord base_##CBNAME() const + + +#define IMP_PYCALLBACK_COORD_const(CLASS, PCLASS, CBNAME) \ + wxCoord CLASS::CBNAME() const { \ + wxCoord 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(); \ + return rval; \ + } \ + wxCoord CLASS::base_##CBNAME() const { \ + return PCLASS::CBNAME(); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK__DCRECTSIZET_constpure(CBNAME) \ + void CBNAME(wxDC& a, const wxRect& b, size_t c) const; + + +#define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyMake_wxObject(&a); \ + PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(); \ + } \ + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK__DCRECTSIZET_const(CBNAME) \ + void CBNAME(wxDC& a, const wxRect& b, size_t c) const; \ + void base_##CBNAME(wxDC& a, const wxRect& b, size_t c) const + + +#define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* obj = wxPyMake_wxObject(&a); \ + PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ + wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOi)", obj, ro, (int)c)); \ + Py_DECREF(obj); \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + PCLASS::CBNAME(a,b,c); \ + } \ + void CLASS::base_##CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ + PCLASS::CBNAME(a,b,c); \ + } + +//--------------------------------------------------------------------------- + + +#define DEC_PYCALLBACK_STRING_SIZET(CBNAME) \ + wxString CBNAME(size_t a) const; \ + wxString base_##CBNAME(size_t a) const + +#define IMP_PYCALLBACK_STRING_SIZET(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME(size_t a) const { \ + wxString rval; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + if (! found) \ + rval = PCLASS::CBNAME(a); \ + return rval; \ + } \ + wxString CLASS::base_##CBNAME(size_t a) const { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_STRING_SIZET_pure(CBNAME) \ + wxString CBNAME(size_t a) const + +#define IMP_PYCALLBACK_STRING_SIZET_pure(CLASS, PCLASS, CBNAME) \ + wxString CLASS::CBNAME(size_t a) const { \ + wxString rval; \ + bool found; \ + wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* ro; \ + ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ + if (ro) { \ + rval = Py2wxString(ro); \ + Py_DECREF(ro); \ + } \ + } \ + wxPyEndBlockThreads(); \ + return rval; \ + } \ + +//--------------------------------------------------------------------------- + #endif