X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/389c55270a6ae54788329dde644c12746a326f68..3af4e610b182d2aeb504bdeeef8b44cb1279f28e:/utils/wxPython/src/helpers.h diff --git a/utils/wxPython/src/helpers.h b/utils/wxPython/src/helpers.h index 92cb512e08..c5a58fbb23 100644 --- a/utils/wxPython/src/helpers.h +++ b/utils/wxPython/src/helpers.h @@ -1,4 +1,4 @@ -///////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// // Name: helpers.h // Purpose: Helper functions/classes for the wxPython extenaion module // @@ -40,6 +40,8 @@ # define HELPEREXPORT #endif +typedef unsigned char byte; + //---------------------------------------------------------------------- class wxPyApp: public wxApp @@ -64,13 +66,43 @@ PyObject* __wxSetDictionary(PyObject*, PyObject* args); void wxPyEventThunker(wxObject*, wxEvent& event); -HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, char* className); +HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, const char* className); HELPEREXPORT bool wxPyRestoreThread(); HELPEREXPORT void wxPySaveThread(bool doSave); -HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, char* className); +HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, const char* className); + + +//---------------------------------------------------------------------- + +class wxPyUserData : public wxObject { +public: + wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); } + ~wxPyUserData() { + bool doSave = wxPyRestoreThread(); + Py_DECREF(m_obj); + wxPySaveThread(doSave); + } + PyObject* m_obj; +}; //---------------------------------------------------------------------- +// These are helpers used by the typemaps + +HELPEREXPORT byte* byte_LIST_helper(PyObject* source); +HELPEREXPORT int* int_LIST_helper(PyObject* source); +HELPEREXPORT long* long_LIST_helper(PyObject* source); +HELPEREXPORT char** string_LIST_helper(PyObject* source); +HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source); +HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source); +HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source); +HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); + +HELPEREXPORT bool wxSize_helper(PyObject* source, wxSize** obj); +HELPEREXPORT bool wxPoint_helper(PyObject* source, wxPoint** obj); +HELPEREXPORT bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj); +HELPEREXPORT bool wxRect_helper(PyObject* source, wxRect** obj); +//---------------------------------------------------------------------- #ifndef SWIGCODE extern "C" void SWIG_MakePtr(char *, void *, char *); @@ -83,7 +115,6 @@ extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type); # pragma warning(disable:4800) #endif -typedef unsigned char byte; // Non-const versions to keep SWIG happy. @@ -94,8 +125,10 @@ extern wxString wxPyEmptyStr; //---------------------------------------------------------------------- class wxPyCallback : public wxObject { + DECLARE_ABSTRACT_CLASS(wxPyCallback); public: wxPyCallback(PyObject* func); + wxPyCallback(const wxPyCallback& other); ~wxPyCallback(); void EventThunker(wxEvent& event); @@ -103,19 +136,6 @@ public: PyObject* m_func; }; -//--------------------------------------------------------------------------- - -// class wxPyMenu : public wxMenu { -// public: -// wxPyMenu(const wxString& title = "", PyObject* func=NULL); -// ~wxPyMenu(); - -// private: -// static void MenuCallback(wxMenu& menu, wxCommandEvent& evt); -// PyObject* func; -// }; - - //--------------------------------------------------------------------------- class wxPyTimer : public wxTimer { @@ -131,20 +151,6 @@ private: //--------------------------------------------------------------------------- -class wxPyEvent : public wxCommandEvent { - DECLARE_DYNAMIC_CLASS(wxPyEvent) -public: - wxPyEvent(wxEventType commandType = wxEVT_NULL, PyObject* userData = Py_None); - ~wxPyEvent(); - - void SetUserData(PyObject* userData); - PyObject* GetUserData(); - -private: - PyObject* m_userData; -}; - - @@ -157,14 +163,15 @@ private: // // **** This class should be combined with wxPyCallback defined above. // -//--------------------------------------------------------------------------- class HELPEREXPORT wxPyCallbackHelper { public: wxPyCallbackHelper(); ~wxPyCallbackHelper(); - void setSelf(PyObject* self); + wxPyCallbackHelper(const wxPyCallbackHelper& other); + + void setSelf(PyObject* self, int incref=TRUE); bool findCallback(const wxString& name); int callCallback(PyObject* argTuple); @@ -173,20 +180,61 @@ public: private: PyObject* m_self; PyObject* m_lastFound; + int m_incRef; +}; + + +//--------------------------------------------------------------------------- +//--------------------------------------------------------------------------- +// These Event classes can be derived from in Python and passed through the +// event system without loosing anything. They do this by keeping a reference +// to themselves and some special case handling in wxPyCallback::EventThunker. + + +class wxPyEvtSelfRef { +public: + wxPyEvtSelfRef(); + ~wxPyEvtSelfRef(); + + void SetSelf(PyObject* self, bool clone=FALSE); + PyObject* GetSelf() const; + +protected: + PyObject* m_self; + bool m_cloned; +}; + + +class wxPyEvent : public wxEvent, public wxPyEvtSelfRef { + DECLARE_DYNAMIC_CLASS(wxPyEvent) +public: + wxPyEvent(int id=0); + ~wxPyEvent(); + + void CopyObject(wxObject& dest) const; }; +class wxPyCommandEvent : public wxCommandEvent, public wxPyEvtSelfRef { + DECLARE_DYNAMIC_CLASS(wxPyCommandEvent) +public: + wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0); + ~wxPyCommandEvent(); + + void CopyObject(wxObject& dest) const; +}; + //--------------------------------------------------------------------------- // 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. +// return type, if any, as well as any parameter types. //--------------------------------------------------------------------------- -#define PYPRIVATE \ - void _setSelf(PyObject* self) { \ - m_myInst.setSelf(self); \ - } \ +#define PYPRIVATE \ + void _setSelf(PyObject* self, int incref=1) { \ + m_myInst.setSelf(self, incref); \ + } \ private: wxPyCallbackHelper m_myInst; //--------------------------------------------------------------------------- @@ -265,7 +313,7 @@ private: bool doSave = wxPyRestoreThread(); \ if (m_myInst.findCallback(#CBNAME)) \ rval = m_myInst.callCallback(Py_BuildValue("(i)",a)); \ - else rval = false; \ + else rval = FALSE; \ wxPySaveThread(doSave); \ return rval; \ } @@ -409,13 +457,15 @@ private: #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ bool doSave = wxPyRestoreThread(); \ + bool rval; \ if (m_myInst.findCallback(#CBNAME)) \ - return m_myInst.callCallback(Py_BuildValue("(Oddddi)", \ + rval = m_myInst.callCallback(Py_BuildValue("(Oddddi)", \ wxPyConstructObject(&a, "wxDC"), \ b, c, d, e, (int)f)); \ else \ - return PCLASS::CBNAME(a, b, c, d, e, f); \ + 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) {\ return PCLASS::CBNAME(a, b, c, d, e, f); \ @@ -499,7 +549,7 @@ private: bool doSave = wxPyRestoreThread(); \ if (m_myInst.findCallback(#CBNAME)) \ m_myInst.callCallback(Py_BuildValue("(Oiddii)", \ - wxPyConstructObject(a, "wxControlPoint"), \ + wxPyConstructObject(a, "wxPyControlPoint"), \ (int)b, c, d, e, f)); \ else \ PCLASS::CBNAME(a, b, c, d, e, f); \ @@ -522,7 +572,7 @@ private: bool doSave = wxPyRestoreThread(); \ if (m_myInst.findCallback(#CBNAME)) \ m_myInst.callCallback(Py_BuildValue("(Oddii)", \ - wxPyConstructObject(a, "wxControlPoint"), \ + wxPyConstructObject(a, "wxPyControlPoint"), \ b, c, d, e)); \ else \ PCLASS::CBNAME(a, b, c, d, e); \ @@ -618,6 +668,29 @@ private: //--------------------------------------------------------------------------- +#define DEC_PYCALLBACK_BOOL_STRINGSTRING(CBNAME) \ + 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 (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(ss)", \ + a.c_str(), b.c_str())); \ + else \ + rval = PCLASS::CBNAME(a, b); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(const wxString& a, const wxString& b) { \ + return PCLASS::CBNAME(a, b); \ + } + +//--------------------------------------------------------------------------- + #define DEC_PYCALLBACK_STRING_(CBNAME) \ wxString CBNAME(); \ wxString base_##CBNAME(); @@ -633,12 +706,12 @@ private: rval = PyString_AsString(PyObject_Str(ro)); \ } \ else \ - rval = PCLASS::CBNAME(a); \ + rval = PCLASS::CBNAME(); \ wxPySaveThread(doSave); \ return rval; \ } \ - bool CLASS::base_##CBNAME(const wxString& a) { \ - return PCLASS::CBNAME(a); \ + wxString CLASS::base_##CBNAME() { \ + return PCLASS::CBNAME(); \ } //--------------------------------------------------------------------------- @@ -668,7 +741,7 @@ private: #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ bool CLASS::CBNAME(const wxHtmlTag& a) { \ - bool rval = false; \ + bool rval = FALSE; \ bool doSave = wxPyRestoreThread(); \ if (m_myInst.findCallback(#CBNAME)) \ rval = m_myInst.callCallback(Py_BuildValue("(O)", \ @@ -678,7 +751,210 @@ private: } //--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK___pure(CBNAME) \ + void CBNAME(); \ + + +#define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ + void CLASS::CBNAME() { \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) \ + m_myInst.callCallback(Py_BuildValue("()")); \ + wxPySaveThread(doSave); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_wxSize__pure(CBNAME) \ + wxSize CBNAME(); \ + + +#define IMP_PYCALLBACK_wxSize__pure(CLASS, PCLASS, CBNAME) \ + wxSize CLASS::CBNAME() { \ + wxSize rval(0,0); \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) { \ + PyObject* ro; \ + wxSize* ptr; \ + ro = m_myInst.callCallbackObj(Py_BuildValue("()")); \ + if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxSize_p")) \ + rval = *ptr; \ + } \ + wxPySaveThread(doSave); \ + return rval; \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_BOOL_WXWIN(CBNAME) \ + bool CBNAME(wxWindow* a); \ + bool base_##CBNAME(wxWindow* a); + + +#define IMP_PYCALLBACK_BOOL_WXWIN(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxWindow* a) { \ + bool rval; \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(O)", \ + wxPyConstructObject((void*)a,"wxWindow"))); \ + else \ + rval = PCLASS::CBNAME(a); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxWindow* a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_BOOL_(CBNAME) \ + bool CBNAME(); \ + bool base_##CBNAME(); + + +#define IMP_PYCALLBACK_BOOL_(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME() { \ + bool rval; \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("()")); \ + else \ + rval = PCLASS::CBNAME(); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME() { \ + return PCLASS::CBNAME(); \ + } + //--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_DR_2WXCDR(CBNAME) \ + wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); \ + wxDragResult base_##CBNAME(wxCoord x, wxCoord y, wxDragResult def); + + +#define IMP_PYCALLBACK_DR_2WXCDR(CLASS, PCLASS, CBNAME) \ + wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + bool doSave = wxPyRestoreThread(); \ + int rval; \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\ + else \ + rval = PCLASS::CBNAME(a, b, c); \ + wxPySaveThread(doSave); \ + return (wxDragResult)rval; \ + } \ + wxDragResult CLASS::base_##CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + return PCLASS::CBNAME(a, b, c); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_BOOL_DR(CBNAME) \ + bool CBNAME(wxDragResult a); \ + bool base_##CBNAME(wxDragResult a); + + +#define IMP_PYCALLBACK_BOOL_DR(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxDragResult a) { \ + bool doSave = wxPyRestoreThread(); \ + bool rval; \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(i)", a)); \ + else \ + rval = PCLASS::CBNAME(a); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxDragResult a) { \ + return PCLASS::CBNAME(a); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_DR_2WXCDR_pure(CBNAME) \ + wxDragResult CBNAME(wxCoord x, wxCoord y, wxDragResult def); + + +#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ + wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ + bool doSave = wxPyRestoreThread(); \ + int rval; \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(iii)", a,b,c));\ + wxPySaveThread(doSave); \ + return (wxDragResult)rval; \ + } \ + +//--------------------------------------------------------------------------- + +#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 (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("(iis)",a,b,c.c_str()));\ + wxPySaveThread(doSave); \ + return rval; \ + } \ + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_SIZET_(CBNAME) \ + size_t CBNAME(); \ + size_t base_##CBNAME(); + + +#define IMP_PYCALLBACK_SIZET_(CLASS, PCLASS, CBNAME) \ + size_t CLASS::CBNAME() { \ + size_t rval; \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) \ + rval = m_myInst.callCallback(Py_BuildValue("()")); \ + else \ + rval = PCLASS::CBNAME(); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + size_t CLASS::base_##CBNAME() { \ + return PCLASS::CBNAME(); \ + } + +//--------------------------------------------------------------------------- + +#define DEC_PYCALLBACK_DATAFMT_SIZET(CBNAME) \ + wxDataFormat CBNAME(); \ + wxDataFormat base_##CBNAME(); + + +#define IMP_PYCALLBACK_DATAFMT_SIZET(CLASS, PCLASS, CBNAME) \ + wxDataFormat CLASS::CBNAME(size_t a) { \ + wxDataFormat rval; \ + bool doSave = wxPyRestoreThread(); \ + if (m_myInst.findCallback(#CBNAME)) { \ + PyObject* ro; \ + wxDataFormat* ptr; \ + ro = m_myInst.callCallbackObj(Py_BuildValue("(i)", a)); \ + if (! SWIG_GetPtrObj(ro, (void **)&ptr, "_wxDataFormat_p")) \ + rval = *ptr; \ + } \ + else \ + rval = PCLASS::CBNAME(a); \ + wxPySaveThread(doSave); \ + return rval; \ + } \ + wxDataFormat CLASS::base_##CBNAME(size_t a) { \ + return PCLASS::CBNAME(a); \ + } + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -687,3 +963,4 @@ private: +