////////////////////////////////////////////////////////////////////////////
// Name: helpers.h
-// Purpose: Helper functions/classes for the wxPython extenaion module
+// Purpose: Helper functions/classes for the wxPython extension module
//
// Author: Robin Dunn
//
#include <wx/wx.h>
-//----------------------------------------------------------------------
-
-// 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
-
//---------------------------------------------------------------------------
public:
wxPyApp();
~wxPyApp();
- int MainLoop(void);
- bool OnInit(void);
+ bool OnInit();
+ int MainLoop();
};
+
extern wxPyApp *wxPythonApp;
//----------------------------------------------------------------------
void wxPyEventThunker(wxObject*, wxEvent& event);
PyObject* wxPyConstructObject(void* ptr,
- const char* className,
+ const wxString& className,
int setThisOwn=0);
PyObject* wxPyConstructObject(void* ptr,
- const char* className,
+ const wxString& className,
PyObject* klass,
int setThisOwn=0);
-PyObject* wxPyClassExists(const char* className);
-PyObject* wxPyMake_wxObject(wxObject* source);
-void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName);
-
-PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
-long wxPyGetWinHandle(wxWindow* win);
-
-//----------------------------------------------------------------------
-
-struct wxPyTState {
- PyThreadState* newState;
- PyThreadState* prevState;
-
- wxPyTState() : newState(NULL), prevState(NULL) {}
-};
+PyObject* wx2PyString(const wxString& src);
+wxString Py2wxString(PyObject* source);
-wxPyTState* wxPyBeginBlockThreads();
-void wxPyEndBlockThreads(wxPyTState* state);
+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);
+PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
+long wxPyGetWinHandle(wxWindow* win);
//----------------------------------------------------------------------
-// Handle wxInputStreams by Joerg Baumann
-// See stream.i for implementations
-
-// 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);
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))
bool _4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4);
-PyObject* wxArrayString2PyList_helper(const wxArrayString& app);
-
+PyObject* wxArrayString2PyList_helper(const wxArrayString& arr);
+PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr);
-#define RETURN_NONE() { Py_INCREF(Py_None); return Py_None; }
+#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)
//----------------------------------------------------------------------
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
class wxPyCallbackHelper;
+
+// Make SunCC happy and make typedef's for these that are extern "C"
+typedef void (*p_SWIG_MakePtr_t)(char*, void*, char*);
+typedef char* (*p_SWIG_GetPtr_t)(char*, void**, char*);
+typedef char* (*p_SWIG_GetPtrObj_t)(PyObject*, void**, char*);
+typedef void (*p_SWIG_RegisterMapping_t)(char*, char*, void *(*cast)(void *));
+typedef void (*p_SWIG_addvarlink_t)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p));
+typedef PyObject* (*p_SWIG_newvarlink_t)(void);
+
+
struct wxPyCoreAPI {
- void (*p_SWIG_MakePtr)(char*, void*, char*);
- char* (*p_SWIG_GetPtr)(char*, void**, char*);
- char* (*p_SWIG_GetPtrObj)(PyObject*, void**, char*);
- void (*p_SWIG_RegisterMapping)(char*, char*, void *(*cast)(void *));
- void (*p_SWIG_addvarlink)(PyObject*, char*, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p));
- PyObject* (*p_SWIG_newvarlink)(void);
+ p_SWIG_MakePtr_t p_SWIG_MakePtr;
+ p_SWIG_GetPtr_t p_SWIG_GetPtr;
+ p_SWIG_GetPtrObj_t p_SWIG_GetPtrObj;
+ p_SWIG_RegisterMapping_t p_SWIG_RegisterMapping;
+ p_SWIG_addvarlink_t p_SWIG_addvarlink;
+ p_SWIG_newvarlink_t p_SWIG_newvarlink;
- wxPyTState* (*p_wxPyBeginBlockThreads)();
- void (*p_wxPyEndBlockThreads)(wxPyTState* state);
+ PyThreadState* (*p_wxPyBeginAllowThreads)();
+ void (*p_wxPyEndAllowThreads)(PyThreadState* state);
+ void (*p_wxPyBeginBlockThreads)();
+ void (*p_wxPyEndBlockThreads)();
- PyObject* (*p_wxPyConstructObject)(void *, const char *, int);
+ 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);
PyObject* (*p_wxPyCBH_callCallbackObj)(const wxPyCallbackHelper& cbh, PyObject* argTuple);
void (*p_wxPyCBH_delete)(wxPyCallbackHelper* cbh);
- PyObject* (*p_wxPyClassExists)(const char* className);
- PyObject* (*p_wxPyMake_wxObject)(wxObject* source);
+ 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 may not use it.
+// Notice that this is static, not extern. This is by design, each module
+// needs one, but doesn't have to use it.
+static wxPyCoreAPI* wxPyCoreAPIPtr = NULL;
#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
+ wxPyCoreAPIPtr->p_wxPyOORClientData_dtor(this);
+#else
+ wxPyOORClientData_dtor(this);
+#endif
+ }
+};
+
//---------------------------------------------------------------------------
// This class holds an instance of a Python Shadow Class object and assists
// with looking up and invoking Python callback methods from C++ virtual
-//----------------------------------------------------------------------
-
-class wxPyUserData : public wxObject {
-public:
- wxPyUserData(PyObject* obj) {
- m_obj = obj;
- Py_INCREF(m_obj);
- }
-
- ~wxPyUserData() {
-#ifdef wxPyUSE_EXPORT
- wxPyTState* state = wxPyCoreAPIPtr->p_wxPyBeginBlockThreads();
- Py_DECREF(m_obj);
- wxPyCoreAPIPtr->p_wxPyEndBlockThreads(state);
-#else
- wxPyTState* state = wxPyBeginBlockThreads();
- Py_DECREF(m_obj);
- wxPyEndBlockThreads(state);
-#endif
- }
- PyObject* m_obj;
-};
-
-
-
-class wxPyClientData : public wxClientData {
-public:
- wxPyClientData(PyObject* obj) {
- m_obj = obj;
- Py_INCREF(m_obj);
- }
-
- ~wxPyClientData() {
-#ifdef wxPyUSE_EXPORT
- wxPyTState* state = wxPyCoreAPIPtr->p_wxPyBeginBlockThreads();
- Py_DECREF(m_obj);
- wxPyCoreAPIPtr->p_wxPyEndBlockThreads(state);
-#else
- wxPyTState* state = wxPyBeginBlockThreads();
- Py_DECREF(m_obj);
- wxPyEndBlockThreads(state);
-#endif
- }
- PyObject* m_obj;
-};
-
-
//---------------------------------------------------------------------------
// These macros are used to implement the virtual methods that should
#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME() { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(); \
} \
#define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a, int b) { \
bool rval=FALSE, found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
#define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(int a, int b) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a,b); \
} \
//---------------------------------------------------------------------------
+#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);
+
+
+#define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \
+ void CLASS::CBNAME(int a, int b, int c, int d) { \
+ bool found; \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d)); \
+ wxPyEndBlockThreads(); \
+ if (! found) \
+ PCLASS::CBNAME(a,b,c,d); \
+ } \
+ void CLASS::base_##CBNAME(int a, int b, int c, int d) { \
+ PCLASS::CBNAME(a,b,c,d); \
+ }
+
+//---------------------------------------------------------------------------
+#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);
+
+
+#define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \
+ void CLASS::CBNAME(int a, int b, int c, int d, int e) { \
+ bool found; \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e)); \
+ wxPyEndBlockThreads(); \
+ if (! found) \
+ PCLASS::CBNAME(a,b,c,d,e); \
+ } \
+ void CLASS::base_##CBNAME(int a, int b, int c, int d, int e) { \
+ PCLASS::CBNAME(a,b,c,d,e); \
+ }
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_VOID_INTPINTP_const(CBNAME) \
+ void CBNAME(int* a, int* b) const; \
+ void base_##CBNAME(int* a, int* b) const;
+
+
+#define IMP_PYCALLBACK_VOID_INTPINTP_const(CLASS, PCLASS, CBNAME) \
+ void CLASS::CBNAME(int* a, int* b) const { \
+ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \
+ bool found; \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* ro; \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
+ if (ro) { \
+ 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)) { \
+ *a = PyInt_AsLong(o1); *b = PyInt_AsLong(o2); \
+ } \
+ else \
+ PyErr_SetString(PyExc_TypeError, errmsg); \
+ Py_DECREF(o1); \
+ Py_DECREF(o2); \
+ } \
+ else { \
+ PyErr_SetString(PyExc_TypeError, errmsg); \
+ } \
+ Py_DECREF(ro); \
+ } \
+ } \
+ wxPyEndBlockThreads(); \
+ if (! found) \
+ PCLASS::CBNAME(a,b); \
+ } \
+ void CLASS::base_##CBNAME(int* a, int* b) const { \
+ PCLASS::CBNAME(a,b); \
+ }
+
+
+//---------------------------------------------------------------------------
+
+#define DEC_PYCALLBACK_SIZE_const(CBNAME) \
+ wxSize CBNAME() const; \
+ wxSize base_##CBNAME() const;
+
+
+#define IMP_PYCALLBACK_SIZE_const(CLASS, PCLASS, CBNAME) \
+ wxSize CLASS::CBNAME() const { \
+ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \
+ bool found; wxSize rval(0,0); \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* ro; \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
+ if (ro) { \
+ 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); \
+ } \
+ } \
+ wxPyEndBlockThreads(); \
+ if (! found) \
+ return PCLASS::CBNAME(); \
+ else \
+ return rval; \
+ } \
+ wxSize CLASS::base_##CBNAME() const { \
+ return PCLASS::CBNAME(); \
+ }
+
+
+//---------------------------------------------------------------------------
+
#define DEC_PYCALLBACK_BOOL_INT(CBNAME) \
bool CBNAME(int a); \
bool base_##CBNAME(int a);
#define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a) { \
bool rval=FALSE, found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a) { \
bool rval=FALSE; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \
else rval = FALSE; \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
}
#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a) { \
bool found; \
- wxPyTState* state = 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(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b); \
} \
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b); \
} \
#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b); \
} \
#define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b, int c, int d) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \
a,b,c,d)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d); \
} \
#define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d, e, f); \
} \
#define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
bool rval=FALSE; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f));\
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b, c, d, e, f); \
return rval; \
#define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(bool a, double b, double c, int d, int e) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \
(int)a,b,c,d,e)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d, e); \
} \
#define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d, e); \
} \
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b); \
} \
void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \
int e, int f) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d, e, f); \
} \
#define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d, e); \
} \
#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b, int c) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c); \
} \
#define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(bool a, double b, double c, int d) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a, b, c, d); \
} \
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 found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \
- wxPyEndBlockThreads(state); \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* s = wx2PyString(a); \
+ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
+ Py_DECREF(s); \
+ } \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
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=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str()));\
- wxPyEndBlockThreads(state); \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* s = wx2PyString(a); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
+ Py_DECREF(s); \
+ } \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#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=FALSE; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
- if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(s)", a.c_str())); \
- wxPyEndBlockThreads(state); \
- return rval; \
- } \
+
+#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)) { \
+ PyObject* s = wx2PyString(a); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
+ Py_DECREF(s); \
+ } \
+ wxPyEndBlockThreads(); \
+ return rval; \
+ } \
//---------------------------------------------------------------------------
#define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a) { \
wxString rval; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(s)", a.c_str()));\
+ PyObject* s = wx2PyString(a); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)", s)); \
+ Py_DECREF(s); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
} \
#define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a,int b) { \
wxString rval; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(si)", a.c_str(),b)); \
+ PyObject* s = wx2PyString(a); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oi)",s,b)); \
+ Py_DECREF(s); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
} \
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=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
- if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ss)", \
- a.c_str(), b.c_str())); \
- wxPyEndBlockThreads(state); \
+ wxPyBeginBlockThreads(); \
+ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
+ PyObject* s1 = wx2PyString(a); \
+ PyObject* s2 = wx2PyString(b); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)",s1,s2)); \
+ Py_DECREF(s1); \
+ Py_DECREF(s2); \
+ } \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b); \
return rval; \
wxString CBNAME(); \
wxString base_##CBNAME();
-
#define IMP_PYCALLBACK_STRING_(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
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); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
#define DEC_PYCALLBACK_STRING__pure(CBNAME) \
wxString CBNAME();
-
#define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \
wxString rval; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
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); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
}
#define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxHtmlTag& a) { \
bool rval=FALSE; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)&a, "wxHtmlTag", 0); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
}
#define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \
- wxString rval; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ 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(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(cell, x, y); \
} \
#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)cell, "wxHtmlCell", 0); \
PyObject* o2 = wxPyConstructObject((void*)&e, "wxMouseEvent", 0); \
Py_DECREF(obj); \
Py_DECREF(o2); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
- PCLASS::CBNAME(cell, x, y, e); \
+ 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); \
+ PCLASS::CBNAME(cell, x, y, e); \
}
#define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME() { \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
}
//---------------------------------------------------------------------------
#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); \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
wxSize* ptr; \
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); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
}
bool CLASS::CBNAME(wxWindow* a) { \
bool rval=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
bool CLASS::CBNAME() { \
bool rval=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
//---------------------------------------------------------------------------
+#define DEC_PYCALLBACK_BOOL_const(CBNAME) \
+ bool CBNAME() const; \
+ bool base_##CBNAME() const;
+
+
+#define IMP_PYCALLBACK_BOOL_const(CLASS, PCLASS, CBNAME) \
+ bool CLASS::CBNAME() const { \
+ 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() const { \
+ 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);
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
int rval=0; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a, b, c); \
return (wxDragResult)rval; \
#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \
wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
wxFSFile* rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \
PyObject* obj = wxPyMake_wxObject(&a); \
- ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Os)",\
- obj, b.c_str())); \
+ PyObject* s = wx2PyString(b); \
+ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(OO)",\
+ obj, s)); \
if (ro) { \
SWIG_GetPtrObj(ro, (void **)&rval, "_wxFSFILE_p"); \
Py_DECREF(ro); \
} \
Py_DECREF(obj); \
+ Py_DECREF(s); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
return rval; \
};
bool CLASS::CBNAME(wxDragResult a) { \
bool rval=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a));\
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
int rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
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=FALSE; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
- if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
- rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
- wxPyEndBlockThreads(state); \
+ wxPyBeginBlockThreads(); \
+ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
+ PyObject* s = wx2PyString(c); \
+ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
+ Py_DECREF(s); \
+ } \
+ wxPyEndBlockThreads(); \
return rval; \
} \
size_t CLASS::CBNAME() { \
size_t rval=0; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(); \
return rval; \
wxDataFormat CLASS::CBNAME(size_t a) { \
wxDataFormat rval=0; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
wxDataFormat* ptr; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(const Type& a) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(Type& a) { \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
PCLASS::CBNAME(a); \
} \
#define IMP_PYCALLBACK_bool_any(CLASS, PCLASS, CBNAME, Type) \
bool CLASS::CBNAME(Type& a) { \
- bool rv; \
+ bool rv=FALSE; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, #Type, 0); \
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
Py_DECREF(obj); \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rv = PCLASS::CBNAME(a); \
return rv; \
wxString CBNAME(long a, long b) const; \
wxString base_##CBNAME(long a, long b)const ;
-
#define IMP_PYCALLBACK_STRING_LONGLONG(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(long a, long b) const { \
wxString rval; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \
if (ro) { \
- PyObject* str = PyObject_Str(ro); \
- rval = PyString_AsString(str); \
- Py_DECREF(ro); Py_DECREF(str); \
+ rval = Py2wxString(ro); \
+ Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a,b); \
return rval; \
int CLASS::CBNAME(long a) const { \
int rval=-1; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
wxListItemAttr *CLASS::CBNAME(long a) const { \
wxListItemAttr *rval = NULL; \
bool found; \
- wxPyTState* state = wxPyBeginBlockThreads(); \
+ wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \
wxListItemAttr* ptr; \
Py_DECREF(ro); \
} \
} \
- wxPyEndBlockThreads(state); \
+ wxPyEndBlockThreads(); \
if (! found) \
rval = PCLASS::CBNAME(a); \
return rval; \
//---------------------------------------------------------------------------
-#define DEC_PYCALLBACK_BOOL_ME(CBNAME) \
- bool CBNAME(wxMouseEvent& e); \
+#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; \
- bool found; \
- wxPyTState* state = 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(state); \
- if (! found) \
- return PCLASS::CBNAME(e); \
- return rval; \
- } \
- bool CLASS::base_##CBNAME(wxMouseEvent& e) { \
- return PCLASS::CBNAME(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); \
}
projects / wxWidgets.git / blobdiff