-/////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
// Name: helpers.h
// Purpose: Helper functions/classes for the wxPython extenaion module
//
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);
+HELPEREXPORT long wxPyGetWinHandle(wxWindow* win);
+
+//----------------------------------------------------------------------
+
+class wxPyUserData : public wxObject {
+public:
+ wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
+ ~wxPyUserData() {
+ bool doSave = wxPyRestoreThread();
+ Py_DECREF(m_obj);
+ wxPySaveThread(doSave);
+ }
+ PyObject* m_obj;
+};
//----------------------------------------------------------------------
// These are helpers used by the typemaps
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 {
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, int incref=TRUE) { \
+ void _setSelf(PyObject* self, int incref=1) { \
m_myInst.setSelf(self, incref); \
} \
private: wxPyCallbackHelper m_myInst;
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; \
}
#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); \
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(); \
}
//---------------------------------------------------------------------------
#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)", \
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); \
+ }
+
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
+
projects / wxWidgets.git / blobdiff