Significantly changed how the Python interpreter lock and thread state
are managed, which should fix the problem of running on a multi-processor machine. Some fixes for some of the contributed library modules. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -17,6 +17,7 @@
|
||||
%{
|
||||
#include "export.h"
|
||||
#include <wx/grid.h>
|
||||
#include <wx/generic/gridctrl.h>
|
||||
%}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
@@ -46,8 +47,9 @@
|
||||
#define PYCALLBACK_GCA_INTINTKIND(PCLASS, CBNAME) \
|
||||
wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
|
||||
wxGridCellAttr* rval = NULL; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
wxGridCellAttr* ptr; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
|
||||
@@ -57,9 +59,9 @@
|
||||
Py_DECREF(ro); \
|
||||
} \
|
||||
} \
|
||||
else \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a, b, c); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
wxGridCellAttr *base_##CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
|
||||
@@ -68,356 +70,376 @@
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \
|
||||
void CBNAME(wxGridCellAttr *attr, int a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \
|
||||
void CBNAME(wxGridCellAttr *attr, int a, int b) { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
bool found; \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
|
||||
Py_DECREF(obj); \
|
||||
} \
|
||||
else \
|
||||
PCLASS::CBNAME(attr, a, b); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(wxGridCellAttr *attr, int a, int b) { \
|
||||
PCLASS::CBNAME(attr, a, b); \
|
||||
Py_DECREF(obj); \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(attr, a, b); \
|
||||
} \
|
||||
void base_##CBNAME(wxGridCellAttr *attr, int a, int b) { \
|
||||
PCLASS::CBNAME(attr, a, b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__GCAINT(PCLASS, CBNAME) \
|
||||
void CBNAME(wxGridCellAttr *attr, int val) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
#define PYCALLBACK__GCAINT(PCLASS, CBNAME) \
|
||||
void CBNAME(wxGridCellAttr *attr, int val) { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
bool found; \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* obj = wxPyConstructObject((void*)attr, "wxGridCellAttr", 0);\
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
|
||||
Py_DECREF(obj); \
|
||||
} \
|
||||
else \
|
||||
PCLASS::CBNAME(attr, val); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(wxGridCellAttr *attr, int val) { \
|
||||
PCLASS::CBNAME(attr, val); \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
|
||||
Py_DECREF(obj); \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(attr, val); \
|
||||
} \
|
||||
void base_##CBNAME(wxGridCellAttr *attr, int val) { \
|
||||
PCLASS::CBNAME(attr, val); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_INT__pure(CBNAME) \
|
||||
int CBNAME() { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
int rval = 0; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
#define PYCALLBACK_INT__pure(CBNAME) \
|
||||
int CBNAME() { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
int rval = 0; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
return rval; \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \
|
||||
bool CBNAME(int a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
bool rval = 0; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
#define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \
|
||||
bool CBNAME(int a, int b) { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
bool rval = 0; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
return rval; \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
|
||||
wxString CBNAME(int a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
wxString rval; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
|
||||
wxString CBNAME(int a, int b) { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
wxString rval; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
return rval; \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
|
||||
void CBNAME(int a, int b, const wxString& c) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str())); \
|
||||
wxPySaveThread(doSave); \
|
||||
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
|
||||
void CBNAME(int a, int b, const wxString& c) { \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",a,b,c.c_str()));\
|
||||
wxPyEndBlockThreads(state); \
|
||||
}
|
||||
|
||||
|
||||
#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \
|
||||
wxString CBNAME(int a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
wxString rval; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} else \
|
||||
rval = PCLASS::CBNAME(a, b); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
wxString base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a, b); \
|
||||
#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \
|
||||
wxString CBNAME(int a, int b) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
wxString rval; \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a, b); \
|
||||
return rval; \
|
||||
} \
|
||||
wxString base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a, b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME) \
|
||||
bool CBNAME(int a, int b, const wxString& c) { \
|
||||
bool rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str())); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(a,b,c); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(int a, int b, const wxString& c) { \
|
||||
return PCLASS::CBNAME(a,b,c); \
|
||||
#define PYCALLBACK_BOOL_INTINTSTRING(PCLASS, CBNAME) \
|
||||
bool CBNAME(int a, int b, const wxString& c) { \
|
||||
bool rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)", a,b,c.c_str()));\
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a,b,c); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(int a, int b, const wxString& c) { \
|
||||
return PCLASS::CBNAME(a,b,c); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME) \
|
||||
long CBNAME(int a, int b) { \
|
||||
long rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
long base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
#define PYCALLBACK_LONG_INTINT(PCLASS, CBNAME) \
|
||||
long CBNAME(int a, int b) { \
|
||||
long rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
return rval; \
|
||||
} \
|
||||
long base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME) \
|
||||
bool CBNAME(int a, int b) { \
|
||||
bool rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
#define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME) \
|
||||
bool CBNAME(int a, int b) { \
|
||||
bool rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \
|
||||
double CBNAME(int a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
double rval; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyFloat_AsDouble(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} else \
|
||||
rval = PCLASS::CBNAME(a, b); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
double base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a, b); \
|
||||
#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \
|
||||
double CBNAME(int a, int b) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
double rval; \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ii)",a,b)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyFloat_AsDouble(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a, b); \
|
||||
return rval; \
|
||||
} \
|
||||
double base_##CBNAME(int a, int b) { \
|
||||
return PCLASS::CBNAME(a, b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__(PCLASS, CBNAME) \
|
||||
void CBNAME() { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
else \
|
||||
PCLASS::CBNAME(); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME() { \
|
||||
PCLASS::CBNAME(); \
|
||||
#define PYCALLBACK__(PCLASS, CBNAME) \
|
||||
void CBNAME() { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(); \
|
||||
} \
|
||||
void base_##CBNAME() { \
|
||||
PCLASS::CBNAME(); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME) \
|
||||
bool CBNAME(size_t a, size_t b) { \
|
||||
bool rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(size_t a, size_t b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
#define PYCALLBACK_BOOL_SIZETSIZET(PCLASS, CBNAME) \
|
||||
bool CBNAME(size_t a, size_t b) { \
|
||||
bool rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a,b); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(size_t a, size_t b) { \
|
||||
return PCLASS::CBNAME(a,b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME) \
|
||||
bool CBNAME(size_t a) { \
|
||||
bool rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(a); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(size_t a) { \
|
||||
return PCLASS::CBNAME(a); \
|
||||
#define PYCALLBACK_BOOL_SIZET(PCLASS, CBNAME) \
|
||||
bool CBNAME(size_t a) { \
|
||||
bool rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME(size_t a) { \
|
||||
return PCLASS::CBNAME(a); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \
|
||||
wxString CBNAME(int a) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
wxString rval; \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} else \
|
||||
rval = PCLASS::CBNAME(a); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
wxString base_##CBNAME(int a) { \
|
||||
return PCLASS::CBNAME(a); \
|
||||
#define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \
|
||||
wxString CBNAME(int a) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
wxString rval; \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(i)",a)); \
|
||||
if (ro) { \
|
||||
PyObject* str = PyObject_Str(ro); \
|
||||
rval = PyString_AsString(str); \
|
||||
Py_DECREF(ro); Py_DECREF(str); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a); \
|
||||
return rval; \
|
||||
} \
|
||||
wxString base_##CBNAME(int a) { \
|
||||
return PCLASS::CBNAME(a); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, const wxString& c) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
|
||||
else \
|
||||
PCLASS::CBNAME(a,c); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(int a, const wxString& c) { \
|
||||
PCLASS::CBNAME(a,c); \
|
||||
#define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, const wxString& c) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(is)", a,c.c_str())); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(a,c); \
|
||||
} \
|
||||
void base_##CBNAME(int a, const wxString& c) { \
|
||||
PCLASS::CBNAME(a,c); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK_BOOL_(PCLASS, CBNAME) \
|
||||
bool CBNAME() { \
|
||||
bool rval; \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
else \
|
||||
rval = PCLASS::CBNAME(); \
|
||||
wxPySaveThread(doSave); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME() { \
|
||||
return PCLASS::CBNAME(); \
|
||||
#define PYCALLBACK_BOOL_(PCLASS, CBNAME) \
|
||||
bool CBNAME() { \
|
||||
bool rval; \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(); \
|
||||
return rval; \
|
||||
} \
|
||||
bool base_##CBNAME() { \
|
||||
return PCLASS::CBNAME(); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \
|
||||
void CBNAME(size_t a, int b) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
else \
|
||||
PCLASS::CBNAME(a,b); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(size_t a, int b) { \
|
||||
PCLASS::CBNAME(a,b); \
|
||||
#define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \
|
||||
void CBNAME(size_t a, int b) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(a,b); \
|
||||
} \
|
||||
void base_##CBNAME(size_t a, int b) { \
|
||||
PCLASS::CBNAME(a,b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, long c) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
|
||||
else \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, long c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, long c) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, long c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, double c) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \
|
||||
else \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, double c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, double c) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, double c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, bool c) { \
|
||||
bool doSave = wxPyRestoreThread(); \
|
||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
|
||||
else \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
wxPySaveThread(doSave); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, bool c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \
|
||||
void CBNAME(int a, int b, bool c) { \
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
|
||||
wxPyEndBlockThreads(state); \
|
||||
if (! found) \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
} \
|
||||
void base_##CBNAME(int a, int b, bool c) { \
|
||||
PCLASS::CBNAME(a,b,c); \
|
||||
}
|
||||
|
||||
|
||||
@@ -483,7 +505,7 @@ public:
|
||||
void Draw(wxGrid& grid, wxGridCellAttr& attr,
|
||||
wxDC& dc, const wxRect& rect,
|
||||
int row, int col, bool isSelected) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "Draw")) {
|
||||
wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(OOOOiii)",
|
||||
@@ -493,13 +515,13 @@ public:
|
||||
wxPyConstructObject((void*)&rect, "wxRect", 0),
|
||||
row, col, isSelected));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
|
||||
int row, int col) {
|
||||
wxSize rval;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
|
||||
PyObject* ro;
|
||||
wxSize* ptr;
|
||||
@@ -515,14 +537,14 @@ public:
|
||||
Py_DECREF(ro);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
||||
wxGridCellRenderer *Clone() const {
|
||||
wxGridCellRenderer* rval = NULL;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "Clone")) {
|
||||
PyObject* ro;
|
||||
wxGridCellRenderer* ptr;
|
||||
@@ -533,7 +555,7 @@ public:
|
||||
Py_DECREF(ro);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
@@ -593,6 +615,27 @@ public:
|
||||
};
|
||||
|
||||
|
||||
class wxGridCellDateTimeRenderer : public wxGridCellStringRenderer
|
||||
{
|
||||
public:
|
||||
wxGridCellDateTimeRenderer(wxString outformat = "%c",
|
||||
wxString informat = "%c");
|
||||
};
|
||||
|
||||
|
||||
class wxGridCellEnumRenderer : public wxGridCellStringRenderer
|
||||
{
|
||||
public:
|
||||
wxGridCellEnumRenderer( const wxString& choices = "" );
|
||||
};
|
||||
|
||||
|
||||
class wxGridCellAutoWrapStringRenderer : public wxGridCellStringRenderer
|
||||
{
|
||||
public:
|
||||
wxGridCellAutoWrapStringRenderer();
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxGridCellEditor is an ABC, and several derived classes are available.
|
||||
@@ -637,7 +680,7 @@ public:
|
||||
wxPyGridCellEditor() : wxGridCellEditor() {}
|
||||
|
||||
void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "Create")) {
|
||||
wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(OiO)",
|
||||
@@ -645,37 +688,37 @@ public:
|
||||
id,
|
||||
wxPyConstructObject((void*)evtHandler, "wxEvtHandler", 0)));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
|
||||
void BeginEdit(int row, int col, wxGrid* grid) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
|
||||
wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(iiO)", row, col,
|
||||
wxPyConstructObject((void*)grid, "wxGrid", 0)));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
|
||||
bool EndEdit(int row, int col, wxGrid* grid) {
|
||||
bool rv = FALSE;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
|
||||
rv = wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(iiO)", row, col,
|
||||
wxPyConstructObject((void*)grid, "wxGrid", 0)));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
wxGridCellEditor*Clone() const {
|
||||
wxGridCellEditor* rval = NULL;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "Clone")) {
|
||||
PyObject* ro;
|
||||
wxGridCellEditor* ptr;
|
||||
@@ -686,20 +729,21 @@ public:
|
||||
Py_DECREF(ro);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
|
||||
void Show(bool show, wxGridCellAttr *attr) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
if (wxPyCBH_findCallback(m_myInst, "Show"))
|
||||
bool found;
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, "Show")))
|
||||
wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(iO)", show,
|
||||
wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
|
||||
else
|
||||
wxPyEndBlockThreads(state);
|
||||
if (! found)
|
||||
wxGridCellEditor::Show(show, attr);
|
||||
wxPySaveThread(doSave);
|
||||
}
|
||||
void base_Show(bool show, wxGridCellAttr *attr) {
|
||||
wxGridCellEditor::Show(show, attr);
|
||||
@@ -707,15 +751,16 @@ public:
|
||||
|
||||
|
||||
void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
if (wxPyCBH_findCallback(m_myInst, "PaintBackground"))
|
||||
bool found; \
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)")))
|
||||
wxPyCBH_callCallback(m_myInst,
|
||||
Py_BuildValue("(OO)",
|
||||
wxPyConstructObject((void*)&rectCell, "wxRect", 0),
|
||||
wxPyConstructObject((void*)attr, "wxGridCellAttr", 0)));
|
||||
else
|
||||
wxPyEndBlockThreads(state);
|
||||
if (! found)
|
||||
wxGridCellEditor::PaintBackground(rectCell, attr);
|
||||
wxPySaveThread(doSave);
|
||||
}
|
||||
void base_PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
|
||||
wxGridCellEditor::PaintBackground(rectCell, attr);
|
||||
@@ -803,6 +848,22 @@ public:
|
||||
bool allowOthers = FALSE);
|
||||
};
|
||||
|
||||
|
||||
class wxGridCellEnumEditor : public wxGridCellChoiceEditor
|
||||
{
|
||||
public:
|
||||
wxGridCellEnumEditor( const wxString& choices = "" );
|
||||
};
|
||||
|
||||
|
||||
class wxGridCellAutoWrapStringEditor : public wxGridCellTextEditor
|
||||
{
|
||||
public:
|
||||
wxGridCellAutoWrapStringEditor();
|
||||
};
|
||||
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1003,7 +1064,7 @@ public:
|
||||
|
||||
|
||||
wxString GetValue(int row, int col) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
wxString rval;
|
||||
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
|
||||
PyObject* ro;
|
||||
@@ -1015,15 +1076,15 @@ public:
|
||||
Py_DECREF(str);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
void SetValue(int row, int col, const wxString& val) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "SetValue"))
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iis)",row,col,val.c_str()));
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
|
||||
@@ -1031,7 +1092,7 @@ public:
|
||||
// the GetValue and SetValue python methods.
|
||||
long GetValueAsLong( int row, int col ) {
|
||||
long rval = 0;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
|
||||
PyObject* ro;
|
||||
PyObject* num;
|
||||
@@ -1045,13 +1106,13 @@ public:
|
||||
Py_DECREF(ro);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
double GetValueAsDouble( int row, int col ) {
|
||||
double rval = 0.0;
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
|
||||
PyObject* ro;
|
||||
PyObject* num;
|
||||
@@ -1065,7 +1126,7 @@ public:
|
||||
Py_DECREF(ro);
|
||||
}
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
return rval;
|
||||
}
|
||||
|
||||
@@ -1074,19 +1135,19 @@ public:
|
||||
}
|
||||
|
||||
void SetValueAsLong( int row, int col, long value ) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
void SetValueAsDouble( int row, int col, double value ) {
|
||||
bool doSave = wxPyRestoreThread();
|
||||
wxPyTState* state = wxPyBeginBlockThreads();
|
||||
if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
|
||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
|
||||
}
|
||||
wxPySaveThread(doSave);
|
||||
wxPyEndBlockThreads(state);
|
||||
}
|
||||
|
||||
void SetValueAsBool( int row, int col, bool value ) {
|
||||
|
||||
Reference in New Issue
Block a user