Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the PyGILState_* APIs on Python >= 2.3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-03-09 22:28:52 +00:00
parent 168f82ce0a
commit 6e6b35578d
37 changed files with 318 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/contrib/activex/activex.i
View File

@@ -64,7 +64,7 @@ static wxString _VARTYPEname(VARTYPE vt);
inline bool wxPyErr_Occurred() inline bool wxPyErr_Occurred()
{ {
bool rval; bool rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
rval = PyErr_Occurred() != NULL; rval = PyErr_Occurred() != NULL;
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return rval; return rval;
@@ -329,7 +329,7 @@ public:
void SetAXProp(const wxString& name, PyObject* value) void SetAXProp(const wxString& name, PyObject* value)
{ {
const wxPropX& prop = GetAXPropDesc(name); const wxPropX& prop = GetAXPropDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
if (! prop.CanSet()) { if (! prop.CanSet()) {
wxString msg; wxString msg;
@@ -365,7 +365,7 @@ public:
{ {
PyObject* rval = NULL; PyObject* rval = NULL;
const wxPropX& prop = GetAXPropDesc(name); const wxPropX& prop = GetAXPropDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
if (! prop.CanGet()) { if (! prop.CanGet()) {
wxString msg; wxString msg;
@@ -411,7 +411,7 @@ public:
PyObject* rval = NULL; PyObject* rval = NULL;
const wxFuncX& func = GetAXMethodDesc(name); const wxFuncX& func = GetAXMethodDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
nargs = func.params.size(); nargs = func.params.size();
if (nargs > 0) if (nargs > 0)
@@ -641,7 +641,7 @@ public:
// handler. We'll convert and load the ActiveX event parameters into // handler. We'll convert and load the ActiveX event parameters into
// attributes of the Python event object. // attributes of the Python event object.
void _preCallInit(PyObject* pyself) { void _preCallInit(PyObject* pyself) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* pList = PyList_New(0); PyObject* pList = PyList_New(0);
PyObject_SetAttrString(pyself, "paramList", pList); PyObject_SetAttrString(pyself, "paramList", pList);
Py_DECREF(pList); Py_DECREF(pList);
@@ -660,7 +660,7 @@ public:
// handler. It reloads any "out" parameters from the python attributes // handler. It reloads any "out" parameters from the python attributes
// back into the wxVariant they came from. // back into the wxVariant they came from.
void _postCallCleanup(PyObject* pyself) { void _postCallCleanup(PyObject* pyself) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
for (int i=0; i<self->ParamCount(); i+=1) { for (int i=0; i<self->ParamCount(); i+=1) {
PyObject* val = PyObject_GetAttrString( PyObject* val = PyObject_GetAttrString(
pyself, (char*)(const char*)self->ParamName(i).mb_str()); pyself, (char*)(const char*)self->ParamName(i).mb_str());

14
wxPython/contrib/activex/activex_wrap.cpp
View File

@@ -1408,7 +1408,7 @@ static wxString _VARTYPEname(VARTYPE vt);
inline bool wxPyErr_Occurred() inline bool wxPyErr_Occurred()
{ {
bool rval; bool rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
rval = PyErr_Occurred() != NULL; rval = PyErr_Occurred() != NULL;
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return rval; return rval;
@@ -1700,7 +1700,7 @@ public:
void SetAXProp(const wxString& name, PyObject* value) void SetAXProp(const wxString& name, PyObject* value)
{ {
const wxPropX& prop = GetAXPropDesc(name); const wxPropX& prop = GetAXPropDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
if (! prop.CanSet()) { if (! prop.CanSet()) {
wxString msg; wxString msg;
@@ -1736,7 +1736,7 @@ public:
{ {
PyObject* rval = NULL; PyObject* rval = NULL;
const wxPropX& prop = GetAXPropDesc(name); const wxPropX& prop = GetAXPropDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
if (! prop.CanGet()) { if (! prop.CanGet()) {
wxString msg; wxString msg;
@@ -1782,7 +1782,7 @@ public:
PyObject* rval = NULL; PyObject* rval = NULL;
const wxFuncX& func = GetAXMethodDesc(name); const wxFuncX& func = GetAXMethodDesc(name);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (! PyErr_Occurred() ) { if (! PyErr_Occurred() ) {
nargs = func.params.size(); nargs = func.params.size();
if (nargs > 0) if (nargs > 0)
@@ -1896,7 +1896,7 @@ SWIG_Check_long(PyObject* obj)
} }
static void wxActiveXEvent__preCallInit(wxActiveXEvent *self,PyObject *pyself){ static void wxActiveXEvent__preCallInit(wxActiveXEvent *self,PyObject *pyself){
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* pList = PyList_New(0); PyObject* pList = PyList_New(0);
PyObject_SetAttrString(pyself, "paramList", pList); PyObject_SetAttrString(pyself, "paramList", pList);
Py_DECREF(pList); Py_DECREF(pList);
@@ -1911,7 +1911,7 @@ static void wxActiveXEvent__preCallInit(wxActiveXEvent *self,PyObject *pyself){
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
static void wxActiveXEvent__postCallCleanup(wxActiveXEvent *self,PyObject *pyself){ static void wxActiveXEvent__postCallCleanup(wxActiveXEvent *self,PyObject *pyself){
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
for (int i=0; i<self->ParamCount(); i+=1) { for (int i=0; i<self->ParamCount(); i+=1) {
PyObject* val = PyObject_GetAttrString( PyObject* val = PyObject_GetAttrString(
pyself, (char*)(const char*)self->ParamName(i).mb_str()); pyself, (char*)(const char*)self->ParamName(i).mb_str());
@@ -4382,7 +4382,7 @@ static PyObject *_wrap_IEHtmlWindowBase_LoadStream(PyObject *, PyObject *args, P
arg2 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp2->m_wxis); arg2 = wxPyCBInputStream_copy((wxPyCBInputStream*)temp2->m_wxis);
} else { } else {
PyErr_Clear(); // clear the failure of the wxPyConvert above PyErr_Clear(); // clear the failure of the wxPyConvert above
arg2 = wxPyCBInputStream_create(obj1, false); arg2 = wxPyCBInputStream_create(obj1, true);
if (arg2 == NULL) { if (arg2 == NULL) {
PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object."); PyErr_SetString(PyExc_TypeError, "Expected wx.InputStream or Python file-like object.");
SWIG_fail; SWIG_fail;

12
wxPython/contrib/gizmos/gizmos.i
View File

@@ -283,7 +283,7 @@ public:
virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) { virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) { if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
PyObject* dcobj = wxPyMake_wxObject(&dc,false); PyObject* dcobj = wxPyMake_wxObject(&dc,false);
PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false); PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false);
@@ -495,7 +495,7 @@ public:
const wxTreeItemId& item2) { const wxTreeItemId& item2) {
int rval = 0; int rval = 0;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0); PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0); PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
@@ -757,7 +757,7 @@ public:
//size_t GetSelections(wxArrayTreeItemIds&) const; //size_t GetSelections(wxArrayTreeItemIds&) const;
%extend { %extend {
PyObject* GetSelections() { PyObject* GetSelections() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0); PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array; wxArrayTreeItemIds array;
size_t num, x; size_t num, x;
@@ -793,7 +793,7 @@ public:
PyObject* GetFirstChild(const wxTreeItemId& item) { PyObject* GetFirstChild(const wxTreeItemId& item) {
void* cookie = 0; void* cookie = 0;
wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -808,7 +808,7 @@ public:
// passed to GetNextChild in order to continue the search. // passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) { PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -927,7 +927,7 @@ public:
PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) { PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) {
wxRect rect; wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) { if (self->GetBoundingRect(item, rect, textOnly)) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect); wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1); PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

12
wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
View File

@@ -1549,7 +1549,7 @@ public:
virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) { virtual void DrawItem(wxDC& dc, wxTreeItemId id, const wxRect& rect) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) { if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
PyObject* dcobj = wxPyMake_wxObject(&dc,false); PyObject* dcobj = wxPyMake_wxObject(&dc,false);
PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false); PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), false);
@@ -1673,7 +1673,7 @@ public:
const wxTreeItemId& item2) { const wxTreeItemId& item2) {
int rval = 0; int rval = 0;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0); PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), 0);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0); PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), 0);
@@ -1822,7 +1822,7 @@ static void wxPyTreeListCtrl_SetItemPyData(wxPyTreeListCtrl *self,wxTreeItemId c
data->SetData(obj); data->SetData(obj);
} }
static PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){ static PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0); PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array; wxArrayTreeItemIds array;
size_t num, x; size_t num, x;
@@ -1838,7 +1838,7 @@ static PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
static PyObject *wxPyTreeListCtrl_GetFirstChild(wxPyTreeListCtrl *self,wxTreeItemId const &item){ static PyObject *wxPyTreeListCtrl_GetFirstChild(wxPyTreeListCtrl *self,wxTreeItemId const &item){
void* cookie = 0; void* cookie = 0;
wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -1847,7 +1847,7 @@ static PyObject *wxPyTreeListCtrl_GetFirstChild(wxPyTreeListCtrl *self,wxTreeIte
} }
static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItemId const &item,void *cookie){ static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItemId const &item,void *cookie){
wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -1885,7 +1885,7 @@ static PyObject *wxPyTreeListCtrl_GetNextChild(wxPyTreeListCtrl *self,wxTreeItem
static PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){ static PyObject *wxPyTreeListCtrl_GetBoundingRect(wxPyTreeListCtrl *self,wxTreeItemId const &item,bool textOnly=false){
wxRect rect; wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) { if (self->GetBoundingRect(item, rect, textOnly)) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect); wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1); PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), 1);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

2
wxPython/contrib/ogl/_oglshapes2.i
View File

@@ -312,7 +312,7 @@ public:
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();

10
wxPython/contrib/ogl/msw/ogl_wrap.cpp
View File

@@ -1816,7 +1816,7 @@ static PyObject *wxPyPolygonShape_GetOriginalPoints(wxPyPolygonShape *self){
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();
@@ -1855,7 +1855,7 @@ static PyObject *wxDiagram_GetShapeList(wxDiagram *self){
// work for any class for the VERY generic cases, but beyond that the helper // work for any class for the VERY generic cases, but beyond that the helper
// needs to know more about the type. // needs to know more about the type.
wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) { wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) { if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object."); PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -1888,7 +1888,7 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) { if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object."); PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -1960,7 +1960,7 @@ PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) {
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();
@@ -1981,7 +1981,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();

8
wxPython/contrib/ogl/ogl.i
View File

@@ -171,7 +171,7 @@ void wxOGLCleanUp();
// work for any class for the VERY generic cases, but beyond that the helper // work for any class for the VERY generic cases, but beyond that the helper
// needs to know more about the type. // needs to know more about the type.
wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) { wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) { if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object."); PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -204,7 +204,7 @@ wxList* wxPy_wxListHelper(PyObject* pyList, const wxChar* className) {
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) { wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyList_Check(pyList)) { if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object."); PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -276,7 +276,7 @@ PyObject* wxPy_ConvertRealPointList(wxListBase* listbase) {
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();
@@ -297,7 +297,7 @@ PyObject* wxPy_ConvertShapeList(wxListBase* listbase) {
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();

2
wxPython/include/wx/wxPython/pyclasses.h
View File

@@ -45,7 +45,7 @@ public:
wxPyValidator* ptr = NULL; wxPyValidator* ptr = NULL;
wxPyValidator* self = (wxPyValidator*)this; wxPyValidator* self = (wxPyValidator*)this;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(self->m_myInst, "Clone")) { if (wxPyCBH_findCallback(self->m_myInst, "Clone")) {
PyObject* ro; PyObject* ro;
ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()")); ro = wxPyCBH_callCallbackObj(self->m_myInst, Py_BuildValue("()"));

4
wxPython/include/wx/wxPython/pytree.h
View File

@@ -25,7 +25,7 @@ public:
} }
~wxPyTreeItemData() { ~wxPyTreeItemData() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(m_obj); Py_DECREF(m_obj);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -36,7 +36,7 @@ public:
} }
void SetData(PyObject* obj) { void SetData(PyObject* obj) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(m_obj); Py_DECREF(m_obj);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
m_obj = obj; m_obj = obj;

183
wxPython/include/wx/wxPython/wxPython_int.h
View File

@@ -136,6 +136,21 @@ bool wxPySwigInstance_Check(PyObject* obj);
#undef WXP_WITH_THREAD #undef WXP_WITH_THREAD
#endif #endif
// In Python 2.3 and later there are the PyGILState_* APIs that we can use for
// blocking threads when calling back into Python. Using them instead of my
// home-grown hacks greatly simplifies wxPyBeginBlockThreads and
// wxPyEndBlockThreads.
#if PY_VERSION_HEX < 0x02030000
#define wxPyUSE_GIL_STATE 0
typedef bool wxPyBlock_t;
#else
#define wxPyUSE_GIL_STATE 1
typedef PyGILState_STATE wxPyBlock_t;
#endif
#ifndef wxPyUSE_EXPORTED_API #ifndef wxPyUSE_EXPORTED_API
// For Python --> C++ // For Python --> C++
@@ -143,8 +158,8 @@ PyThreadState* wxPyBeginAllowThreads();
void wxPyEndAllowThreads(PyThreadState* state); void wxPyEndAllowThreads(PyThreadState* state);
// For C++ --> Python // For C++ --> Python
bool wxPyBeginBlockThreads(); wxPyBlock_t wxPyBeginBlockThreads();
void wxPyEndBlockThreads(bool blocked); void wxPyEndBlockThreads(wxPyBlock_t blocked);
#endif // wxPyUSE_EXPORTED_API #endif // wxPyUSE_EXPORTED_API
@@ -152,13 +167,13 @@ void wxPyEndBlockThreads(bool blocked);
// A macro that will help to execute simple statments wrapped in // A macro that will help to execute simple statments wrapped in
// StartBlock/EndBlockThreads calls // StartBlock/EndBlockThreads calls
#define wxPyBLOCK_THREADS(stmt) \ #define wxPyBLOCK_THREADS(stmt) \
{ bool blocked = wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(blocked); } { wxPyBlock_t blocked = wxPyBeginBlockThreads(); stmt; wxPyEndBlockThreads(blocked); }
// Raise the NotImplementedError exception (blocking threads) // Raise the NotImplementedError exception (blocking threads)
#define wxPyRaiseNotImplemented() \ #define wxPyRaiseNotImplemented() \
wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError)) wxPyBLOCK_THREADS(PyErr_SetNone(PyExc_NotImplementedError))
// Raise any exception witha string value (blocking threads) // Raise any exception with a string value (blocking threads)
#define wxPyErr_SetString(err, str) \ #define wxPyErr_SetString(err, str) \
wxPyBLOCK_THREADS(PyErr_SetString(err, str)) wxPyBLOCK_THREADS(PyErr_SetString(err, str))
@@ -341,8 +356,8 @@ struct wxPyCoreAPI {
PyThreadState* (*p_wxPyBeginAllowThreads)(); PyThreadState* (*p_wxPyBeginAllowThreads)();
void (*p_wxPyEndAllowThreads)(PyThreadState* state); void (*p_wxPyEndAllowThreads)(PyThreadState* state);
bool (*p_wxPyBeginBlockThreads)(); wxPyBlock_t (*p_wxPyBeginBlockThreads)();
void (*p_wxPyEndBlockThreads)(bool blocked); void (*p_wxPyEndBlockThreads)(wxPyBlock_t blocked);
PyObject* (*p_wxPy_ConvertList)(wxListBase* list); PyObject* (*p_wxPy_ConvertList)(wxListBase* list);
@@ -608,7 +623,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME() { \ void CLASS::CBNAME() { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -629,7 +644,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_INTINT(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a, int b) { \ bool CLASS::CBNAME(int a, int b) { \
bool rval=false, found; \ bool rval=false, found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -651,7 +666,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME() { \ void CLASS::CBNAME() { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -672,7 +687,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_INTINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(int a, int b) { \ void CLASS::CBNAME(int a, int b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -693,7 +708,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(int a) { \ void CLASS::CBNAME(int a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -714,7 +729,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_INT4(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(int a, int b, int c, int d) { \ void CLASS::CBNAME(int a, int b, int c, int d) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiii)",a,b,c,d)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -734,7 +749,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_INT5(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(int a, int b, int c, int d, int e) { \ void CLASS::CBNAME(int a, int b, int c, int d, int e) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiiii)",a,b,c,d,e)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -756,7 +771,7 @@ extern wxPyApp *wxPythonApp;
void CLASS::CBNAME(int* a, int* b) const { \ void CLASS::CBNAME(int* a, int* b) const { \
const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -798,7 +813,7 @@ extern wxPyApp *wxPythonApp;
wxSize CLASS::CBNAME() const { \ wxSize CLASS::CBNAME() const { \
const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \ const char* errmsg = #CBNAME " should return a 2-tuple of integers."; \
bool found; wxSize rval(0,0); \ bool found; wxSize rval(0,0); \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -841,7 +856,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_BOOL(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(bool a) { \ bool CLASS::CBNAME(bool a) { \
bool rval=false, found; \ bool rval=false, found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -863,7 +878,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_INT(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a) { \ bool CLASS::CBNAME(int a) { \
bool rval=false, found; \ bool rval=false, found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a));\
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -884,7 +899,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_INT_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a) { \ bool CLASS::CBNAME(int a) { \
bool rval=false; \ bool rval=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)",a)); \
else rval = false; \ else rval = false; \
@@ -903,7 +918,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DC(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a) { \ void CLASS::CBNAME(wxDC& a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -929,7 +944,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \ void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
@@ -953,7 +968,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \ void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
@@ -977,7 +992,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__2DBL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b) { \ void CLASS::CBNAME(double a, double b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(dd)",a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -998,7 +1013,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b, int c, int d) { \ void CLASS::CBNAME(double a, double b, int c, int d) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddii)", \
a,b,c,d)); \ a,b,c,d)); \
@@ -1020,7 +1035,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DC4DBLBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddddi)", obj, b, c, d, e, (int)f)); \
@@ -1044,7 +1059,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_DC4DBLBOOL(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \ bool CLASS::CBNAME(wxDC& a, double b, double c, double d, double e, bool f) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
bool rval=false; \ bool rval=false; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
@@ -1070,7 +1085,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(bool a, double b, double c, int d, int e) { \ void CLASS::CBNAME(bool a, double b, double c, int d, int e) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \
(int)a,b,c,d,e)); \ (int)a,b,c,d,e)); \
@@ -1092,7 +1107,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DC4DBL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \ void CLASS::CBNAME(wxDC& a, double b, double c, double d, double e) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Odddd)", obj, b, c, d, e)); \
@@ -1116,7 +1131,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DCBOOL(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, bool b) { \ void CLASS::CBNAME(wxDC& a, bool b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, (int)b)); \
@@ -1141,7 +1156,7 @@ extern wxPyApp *wxPythonApp;
void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \ void CLASS::CBNAME(wxControlPoint* a, bool b, double c, double d, \
int e, int f) { \ int e, int f) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a,false); \ PyObject* obj = wxPyMake_wxObject(a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oiddii)", obj, (int)b, c, d, e, f));\
@@ -1166,7 +1181,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__WXCP2DBL2INT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \ void CLASS::CBNAME(wxControlPoint* a, double b, double c, int d, int e) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a,false); \ PyObject* obj = wxPyMake_wxObject(a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oddii)", obj, b, c, d, e)); \
@@ -1191,7 +1206,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__2DBLINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(double a, double b, int c) { \ void CLASS::CBNAME(double a, double b, int c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ddi)", a,b,c)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1212,7 +1227,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__BOOL2DBLINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(bool a, double b, double c, int d) { \ void CLASS::CBNAME(bool a, double b, double c, int d) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddi)", (int)a,b,c,d));\
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1233,7 +1248,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__STRING(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(const wxString& a) { \ void CLASS::CBNAME(const wxString& a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
@@ -1257,7 +1272,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(const wxString& a) { \ bool CLASS::CBNAME(const wxString& a) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
@@ -1280,7 +1295,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_STRING_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxString& a) { \ bool CLASS::CBNAME(const wxString& a) { \
bool rval=false; \ bool rval=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); \
@@ -1298,7 +1313,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_STRING_STRING_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a) { \ wxString CLASS::CBNAME(const wxString& a) { \
wxString rval; \ wxString rval; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
@@ -1323,7 +1338,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME(const wxString& a) { \ wxString CLASS::CBNAME(const wxString& a) { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
@@ -1348,7 +1363,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_STRING_STRINGINT_pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME(const wxString& a,int b) { \ wxString CLASS::CBNAME(const wxString& a,int b) { \
wxString rval; \ wxString rval; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
PyObject* s = wx2PyString(a); \ PyObject* s = wx2PyString(a); \
@@ -1373,7 +1388,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(const wxString& a, const wxString& b) { \ bool CLASS::CBNAME(const wxString& a, const wxString& b) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s1 = wx2PyString(a); \ PyObject* s1 = wx2PyString(a); \
PyObject* s2 = wx2PyString(b); \ PyObject* s2 = wx2PyString(b); \
@@ -1400,7 +1415,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME() { \ wxString CLASS::CBNAME() { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -1428,7 +1443,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME() const { \ wxString CLASS::CBNAME() const { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -1454,7 +1469,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_STRING__pure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() { \ wxString CLASS::CBNAME() { \
wxString rval; \ wxString rval; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -1475,7 +1490,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_STRING__constpure(CLASS, PCLASS, CBNAME) \
wxString CLASS::CBNAME() const { \ wxString CLASS::CBNAME() const { \
wxString rval; \ wxString rval; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -1497,7 +1512,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_TAG_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(const wxHtmlTag& a) { \ bool CLASS::CBNAME(const wxHtmlTag& a) { \
bool rval=false; \ bool rval=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0);\ PyObject* obj = wxPyConstructObject((void*)&a, wxT("wxHtmlTag"), 0);\
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -1516,7 +1531,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__CELLINTINT(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \
wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y)); \ wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(Oii)",obj,x,y)); \
@@ -1539,7 +1554,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__COLOUR(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__COLOUR(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(const wxColour& c) { \ void CLASS::CBNAME(const wxColour& c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&c, wxT("wxColour"), 0); \ PyObject* obj = wxPyConstructObject((void*)&c, wxT("wxColour"), 0); \
wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \ wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(O)",obj)); \
@@ -1562,7 +1577,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__CELLINTINTME(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \ void CLASS::CBNAME(wxHtmlCell *cell, wxCoord x, wxCoord y, const wxMouseEvent& e) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \ PyObject* obj = wxPyConstructObject((void*)cell, wxT("wxHtmlCell"), 0); \
PyObject* o2 = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ PyObject* o2 = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \
@@ -1588,7 +1603,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK___pure(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME() { \ void CLASS::CBNAME() { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1604,7 +1619,7 @@ extern wxPyApp *wxPythonApp;
wxSize CLASS::CBNAME() { \ wxSize CLASS::CBNAME() { \
const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \ const char* errmsg = #CBNAME " should return a 2-tuple of integers or a wxSize object."; \
wxSize rval(0,0); \ wxSize rval(0,0); \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
wxSize* ptr; \ wxSize* ptr; \
@@ -1643,7 +1658,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(wxWindow* a) { \ bool CLASS::CBNAME(wxWindow* a) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a,false); \ PyObject* obj = wxPyMake_wxObject(a,false); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -1669,7 +1684,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(wxWindow* a, wxDC& b) { \ bool CLASS::CBNAME(wxWindow* a, wxDC& b) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* win = wxPyMake_wxObject(a,false); \ PyObject* win = wxPyMake_wxObject(a,false); \
PyObject* dc = wxPyMake_wxObject(&b,false); \ PyObject* dc = wxPyMake_wxObject(&b,false); \
@@ -1696,7 +1711,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_WXWINBASE(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxWindowBase* a) { \ void CLASS::CBNAME(wxWindowBase* a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(a,false); \ PyObject* obj = wxPyMake_wxObject(a,false); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -1721,7 +1736,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME() { \ bool CLASS::CBNAME() { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1744,7 +1759,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME() const { \ bool CLASS::CBNAME() const { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1767,7 +1782,7 @@ extern wxPyApp *wxPythonApp;
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
int rval=0; \ int rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1786,7 +1801,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_FSF_FSSTRING_pure(CLASS, PCLASS, CBNAME) \
wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \ wxFSFile* CLASS::CBNAME(wxFileSystem& a,const wxString& b) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
wxFSFile* rval=0; \ wxFSFile* rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
@@ -1816,7 +1831,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(wxDragResult a) { \ bool CLASS::CBNAME(wxDragResult a) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1836,7 +1851,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_DR_2WXCDR_pure(CLASS, PCLASS, CBNAME) \
wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \ wxDragResult CLASS::CBNAME(wxCoord a, wxCoord b, wxDragResult c) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
int rval=0; \ int rval=0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c));\
@@ -1852,7 +1867,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_INTINTSTR_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(int a, int b, const wxString& c) { \ bool CLASS::CBNAME(int a, int b, const wxString& c) { \
bool rval=false; \ bool rval=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* s = wx2PyString(c); \ PyObject* s = wx2PyString(c); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
@@ -1873,7 +1888,7 @@ extern wxPyApp *wxPythonApp;
size_t CLASS::CBNAME() { \ size_t CLASS::CBNAME() { \
size_t rval=0; \ size_t rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1896,7 +1911,7 @@ extern wxPyApp *wxPythonApp;
size_t CLASS::CBNAME() const { \ size_t CLASS::CBNAME() const { \
size_t rval=0; \ size_t rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -1919,7 +1934,7 @@ extern wxPyApp *wxPythonApp;
wxDataFormat CLASS::CBNAME(size_t a) { \ wxDataFormat CLASS::CBNAME(size_t a) { \
wxDataFormat rval=0; \ wxDataFormat rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
wxDataFormat* ptr; \ wxDataFormat* ptr; \
@@ -1949,7 +1964,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \ #define IMP_PYCALLBACK__constany(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(const Type& a) { \ void CLASS::CBNAME(const Type& a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -1974,7 +1989,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \ #define IMP_PYCALLBACK__any(CLASS, PCLASS, CBNAME, Type) \
void CLASS::CBNAME(Type& a) { \ void CLASS::CBNAME(Type& a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -1999,7 +2014,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(Type& a) { \ bool CLASS::CBNAME(Type& a) { \
bool rv=false; \ bool rv=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -2023,7 +2038,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \ #define IMP_PYCALLBACK_bool_anypure(CLASS, PCLASS, CBNAME, Type) \
bool CLASS::CBNAME(Type& a) { \ bool CLASS::CBNAME(Type& a) { \
bool rv=false; \ bool rv=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \ PyObject* obj = wxPyConstructObject((void*)&a, wxT(#Type), 0); \
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -2043,7 +2058,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME(long a, long b) const { \ wxString CLASS::CBNAME(long a, long b) const { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \
@@ -2072,7 +2087,7 @@ extern wxPyApp *wxPythonApp;
int CLASS::CBNAME(long a) const { \ int CLASS::CBNAME(long a) const { \
int rval=-1; \ int rval=-1; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
@@ -2101,7 +2116,7 @@ extern wxPyApp *wxPythonApp;
int CLASS::CBNAME(long a) const { \ int CLASS::CBNAME(long a) const { \
int rval=-1; /* this rval is important for OnGetItemImage */ \ int rval=-1; /* this rval is important for OnGetItemImage */ \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
@@ -2126,7 +2141,7 @@ extern wxPyApp *wxPythonApp;
wxListItemAttr *CLASS::CBNAME(long a) const { \ wxListItemAttr *CLASS::CBNAME(long a) const { \
wxListItemAttr *rval = NULL; \ wxListItemAttr *rval = NULL; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
wxListItemAttr* ptr; \ wxListItemAttr* ptr; \
@@ -2156,7 +2171,7 @@ extern wxPyApp *wxPythonApp;
bool CLASS::CBNAME(wxMouseEvent& e) { \ bool CLASS::CBNAME(wxMouseEvent& e) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
PyObject* obj = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \ PyObject* obj = wxPyConstructObject((void*)&e, wxT("wxMouseEvent"), 0); \
@@ -2185,7 +2200,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_WIZPG__pure(CLASS, PCLASS, CBNAME) \
wxWizardPage* CLASS::CBNAME() const { \ wxWizardPage* CLASS::CBNAME() const { \
wxWizardPage* rv = NULL; \ wxWizardPage* rv = NULL; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -2206,7 +2221,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BITMAP__pure(CLASS, PCLASS, CBNAME) \
wxBitmap CLASS::CBNAME() const { \ wxBitmap CLASS::CBNAME() const { \
wxBitmap rv; \ wxBitmap rv; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
wxBitmap* ptr; \ wxBitmap* ptr; \
@@ -2229,7 +2244,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_OBJECT__pure(CLASS, PCLASS, CBNAME) \
wxObject* CLASS::CBNAME() { \ wxObject* CLASS::CBNAME() { \
wxObject* rv = NULL; \ wxObject* rv = NULL; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); \
@@ -2250,7 +2265,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_OBJECT_STRING_pure(CLASS, PCLASS, CBNAME) \
wxObject* CLASS::CBNAME(const wxString& a) { \ wxObject* CLASS::CBNAME(const wxString& a) { \
wxObject* rv = NULL; \ wxObject* rv = NULL; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* so = wx2PyString(a); \ PyObject* so = wx2PyString(a); \
PyObject* ro; \ PyObject* ro; \
@@ -2274,7 +2289,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_BOOL_NODE_pure(CLASS, PCLASS, CBNAME) \
bool CLASS::CBNAME(wxXmlNode* a) { \ bool CLASS::CBNAME(wxXmlNode* a) { \
bool rv=false; \ bool rv=false; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0); \ PyObject* obj = wxPyConstructObject((void*)a, wxT("wxXmlNode"), 0); \
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \ rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); \
@@ -2294,7 +2309,7 @@ extern wxPyApp *wxPythonApp;
wxCoord CLASS::CBNAME(size_t a) const { \ wxCoord CLASS::CBNAME(size_t a) const { \
wxCoord rval=0; \ wxCoord rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
} \ } \
@@ -2312,7 +2327,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK_VOID_SIZETSIZET_const(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(size_t a, size_t b) const { \ void CLASS::CBNAME(size_t a, size_t b) const { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -2334,7 +2349,7 @@ extern wxPyApp *wxPythonApp;
wxCoord CLASS::CBNAME() const { \ wxCoord CLASS::CBNAME() const { \
wxCoord rval=0; \ wxCoord rval=0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -2355,7 +2370,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DCRECTSIZET_constpure(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \
@@ -2375,7 +2390,7 @@ extern wxPyApp *wxPythonApp;
#define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME) \ #define IMP_PYCALLBACK__DCRECTSIZET_const(CLASS, PCLASS, CBNAME) \
void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \ void CLASS::CBNAME(wxDC& a, const wxRect& b, size_t c) const { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxObject(&a,false); \ PyObject* obj = wxPyMake_wxObject(&a,false); \
PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \ PyObject* ro = wxPyConstructObject((void*)&b, wxT("wxRect"), 0); \
@@ -2401,7 +2416,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME(size_t a) const { \ wxString CLASS::CBNAME(size_t a) const { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
@@ -2428,7 +2443,7 @@ extern wxPyApp *wxPythonApp;
wxString CLASS::CBNAME(size_t a) const { \ wxString CLASS::CBNAME(size_t a) const { \
wxString rval; \ wxString rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(l)",a)); \
@@ -2452,7 +2467,7 @@ extern wxPyApp *wxPythonApp;
wxVisualAttributes CLASS::CBNAME() const { \ wxVisualAttributes CLASS::CBNAME() const { \
wxVisualAttributes rval; \ wxVisualAttributes rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
wxVisualAttributes* ptr; \ wxVisualAttributes* ptr; \

6
wxPython/samples/embedded/embedded.cpp
View File

@@ -190,7 +190,7 @@ void MyFrame::OnPyFrame(wxCommandEvent& event)
// First, whenever you do anything with Python objects or code, you // First, whenever you do anything with Python objects or code, you
// *MUST* aquire the Global Interpreter Lock and block other // *MUST* aquire the Global Interpreter Lock and block other
// Python threads from running. // Python threads from running.
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
// Execute the code in the __main__ module // Execute the code in the __main__ module
PyRun_SimpleString(python_code1); PyRun_SimpleString(python_code1);
@@ -211,7 +211,7 @@ import wx\n\
output = wx.PyOnDemandOutputWindow()\n\ output = wx.PyOnDemandOutputWindow()\n\
sys.stdin = sys.stderr = output\n\ sys.stdin = sys.stderr = output\n\
"; ";
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyRun_SimpleString(python_redirect); PyRun_SimpleString(python_redirect);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -242,7 +242,7 @@ wxWindow* MyFrame::DoPythonStuff(wxWindow* parent)
PyObject* result; PyObject* result;
// As always, first grab the GIL // As always, first grab the GIL
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
// Now make a dictionary to serve as the global namespace when the code is // Now make a dictionary to serve as the global namespace when the code is
// executed. Put a reference to the builtins module in it. (Yes, the // executed. Put a reference to the builtins module in it. (Yes, the

2
wxPython/src/_artprov.i
View File

@@ -92,7 +92,7 @@ public:
const wxArtClient& client, const wxArtClient& client,
const wxSize& size) { const wxSize& size) {
wxBitmap rval = wxNullBitmap; wxBitmap rval = wxNullBitmap;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) { if ((wxPyCBH_findCallback(m_myInst, "CreateBitmap"))) {
PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0); PyObject* so = wxPyConstructObject((void*)&size, wxT("wxSize"), 0);
PyObject* ro; PyObject* ro;

22
wxPython/src/_dataobj.i
View File

@@ -243,7 +243,7 @@ in the given direction.", "");
wxDataFormat* formats = new wxDataFormat[count]; wxDataFormat* formats = new wxDataFormat[count];
self->GetAllFormats(formats, dir); self->GetAllFormats(formats, dir);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* list = PyList_New(count); PyObject* list = PyList_New(count);
for (size_t i=0; i<count; i++) { for (size_t i=0; i<count; i++) {
wxDataFormat* format = new wxDataFormat(formats[i]); wxDataFormat* format = new wxDataFormat(formats[i]);
@@ -272,7 +272,7 @@ in the given direction.", "");
PyObject* GetDataHere(const wxDataFormat& format) { PyObject* GetDataHere(const wxDataFormat& format) {
PyObject* rval = NULL; PyObject* rval = NULL;
size_t size = self->GetDataSize(format); size_t size = self->GetDataSize(format);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (size) { if (size) {
char* buf = new char[size]; char* buf = new char[size];
if (self->GetDataHere(format, buf)) if (self->GetDataHere(format, buf))
@@ -301,7 +301,7 @@ in the given direction.", "");
%extend { %extend {
bool SetData(const wxDataFormat& format, PyObject* data) { bool SetData(const wxDataFormat& format, PyObject* data) {
bool rval; bool rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (PyString_Check(data)) { if (PyString_Check(data)) {
rval = self->SetData(format, PyString_Size(data), PyString_AsString(data)); rval = self->SetData(format, PyString_Size(data), PyString_AsString(data));
} }
@@ -363,7 +363,7 @@ supports rendering its data.", "");
PyObject* GetDataHere() { PyObject* GetDataHere() {
PyObject* rval = NULL; PyObject* rval = NULL;
size_t size = self->GetDataSize(); size_t size = self->GetDataSize();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (size) { if (size) {
char* buf = new char[size]; char* buf = new char[size];
if (self->GetDataHere(buf)) if (self->GetDataHere(buf))
@@ -388,7 +388,7 @@ derived class if the object supports setting its data.
%extend { %extend {
bool SetData(PyObject* data) { bool SetData(PyObject* data) {
bool rval; bool rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (PyString_Check(data)) { if (PyString_Check(data)) {
rval = self->SetData(PyString_Size(data), PyString_AsString(data)); rval = self->SetData(PyString_Size(data), PyString_AsString(data));
} }
@@ -428,7 +428,7 @@ bool wxPyDataObjectSimple::GetDataHere(void *buf) const {
// C++ version. // C++ version.
bool rval = false; bool rval = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) { if (wxPyCBH_findCallback(m_myInst, "GetDataHere")) {
PyObject* ro; PyObject* ro;
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
@@ -447,7 +447,7 @@ bool wxPyDataObjectSimple::SetData(size_t len, const void *buf) const{
// For this one we simply need to make a string from buf and len // For this one we simply need to make a string from buf and len
// and send it to the Python method. // and send it to the Python method.
bool rval = false; bool rval = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetData")) { if (wxPyCBH_findCallback(m_myInst, "SetData")) {
PyObject* data = PyString_FromStringAndSize((char*)buf, len); PyObject* data = PyString_FromStringAndSize((char*)buf, len);
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", data)); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", data));
@@ -665,7 +665,7 @@ public:
wxBitmap wxPyBitmapDataObject::GetBitmap() const { wxBitmap wxPyBitmapDataObject::GetBitmap() const {
wxBitmap* rval = &wxNullBitmap; wxBitmap* rval = &wxNullBitmap;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetBitmap")) { if (wxPyCBH_findCallback(m_myInst, "GetBitmap")) {
PyObject* ro; PyObject* ro;
wxBitmap* ptr; wxBitmap* ptr;
@@ -681,7 +681,7 @@ wxBitmap wxPyBitmapDataObject::GetBitmap() const {
} }
void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) { if (wxPyCBH_findCallback(m_myInst, "SetBitmap")) {
PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false); PyObject* bo = wxPyConstructObject((void*)&bitmap, wxT("wxBitmap"), false);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", bo));
@@ -764,7 +764,7 @@ public:
%extend { %extend {
bool SetData(PyObject* data) { bool SetData(PyObject* data) {
bool rval; bool rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (PyString_Check(data)) { if (PyString_Check(data)) {
rval = self->SetData(PyString_Size(data), PyString_AsString(data)); rval = self->SetData(PyString_Size(data), PyString_AsString(data));
} }
@@ -790,7 +790,7 @@ public:
%extend { %extend {
PyObject* GetData() { PyObject* GetData() {
PyObject* obj; PyObject* obj;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
obj = PyString_FromStringAndSize((char*)self->GetData(), self->GetSize()); obj = PyString_FromStringAndSize((char*)self->GetData(), self->GetSize());
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return obj; return obj;

2
wxPython/src/_datetime.i
View File

@@ -372,7 +372,7 @@ public:
wxString am; wxString am;
wxString pm; wxString pm;
wxDateTime::GetAmPmStrings(&am, &pm); wxDateTime::GetAmPmStrings(&am, &pm);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wx2PyString(am)); PyTuple_SET_ITEM(tup, 0, wx2PyString(am));
PyTuple_SET_ITEM(tup, 1, wx2PyString(pm)); PyTuple_SET_ITEM(tup, 1, wx2PyString(pm));

2
wxPython/src/_display.i
View File

@@ -206,7 +206,7 @@ function is not supported at all on this platform.", "");
PyObject* GetModes(const wxVideoMode& mode = wxDefaultVideoMode) { PyObject* GetModes(const wxVideoMode& mode = wxDefaultVideoMode) {
PyObject* pyList = NULL; PyObject* pyList = NULL;
wxArrayVideoModes arr = self->GetModes(mode); wxArrayVideoModes arr = self->GetModes(mode);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
for (int i=0; i < arr.GetCount(); i++) { for (int i=0; i < arr.GetCount(); i++) {
wxVideoMode* m = new wxVideoMode(arr.Item(i)); wxVideoMode* m = new wxVideoMode(arr.Item(i));

2
wxPython/src/_dnd.i
View File

@@ -220,7 +220,7 @@ public:
bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y, bool wxPyFileDropTarget::OnDropFiles(wxCoord x, wxCoord y,
const wxArrayString& filenames) { const wxArrayString& filenames) {
bool rval = false; bool rval = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) { if (wxPyCBH_findCallback(m_myInst, "OnDropFiles")) {
PyObject* list = wxArrayString2PyList_helper(filenames); PyObject* list = wxArrayString2PyList_helper(filenames);
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list)); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",x,y,list));

2
wxPython/src/_filesys.i
View File

@@ -206,7 +206,7 @@ public:
return; return;
} }
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
void* ptr = (void*)PyString_AsString(data); void* ptr = (void*)PyString_AsString(data);
size_t size = PyString_Size(data); size_t size = PyString_Size(data);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

12
wxPython/src/_gbsizer.i
View File

@@ -94,7 +94,7 @@ public:
} }
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow())); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetCol()));
@@ -163,7 +163,7 @@ cell in each direction.", "");
} }
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan())); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRowspan()));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan())); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->GetColspan()));
@@ -231,7 +231,7 @@ are created automatically when the sizer's Add method is called.", "");
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -250,7 +250,7 @@ are created automatically when the sizer's Add method is called.", "");
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -270,7 +270,7 @@ are created automatically when the sizer's Add method is called.", "");
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -388,7 +388,7 @@ position, False if something was already there.
PyObject* userData = NULL ) { PyObject* userData = NULL ) {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( userData && (info.window || info.sizer || info.gotSize) ) if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData); data = new wxPyUserData(userData);

12
wxPython/src/_gdicmn.i
View File

@@ -191,7 +191,7 @@ of this object (i.e. equal to -1) with those of the other.", "");
"Get() -> (width,height)", "Get() -> (width,height)",
"Returns the width and height properties as a tuple.", ""); "Returns the width and height properties as a tuple.", "");
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
@@ -264,7 +264,7 @@ public:
"Get() -> (x,y)", "Get() -> (x,y)",
"Return the x and y properties as a tuple. ", ""); "Return the x and y properties as a tuple. ", "");
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x)); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
@@ -377,7 +377,7 @@ public:
"Get() -> (x,y)", "Get() -> (x,y)",
"Return the x and y properties as a tuple. ", ""); "Return the x and y properties as a tuple. ", "");
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
@@ -594,7 +594,7 @@ bottom, otherwise it is moved to the left or top respectively.", "",
"Get() -> (x,y,width,height)", "Get() -> (x,y,width,height)",
"Return the rectangle properties as a tuple.", ""); "Return the rectangle properties as a tuple.", "");
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(4); PyObject* tup = PyTuple_New(4);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
@@ -640,7 +640,7 @@ DocAStr(wxIntersectRect,
dest = reg1.GetBox(); dest = reg1.GetBox();
if (dest != wxRect(0,0,0,0)) { if (dest != wxRect(0,0,0,0)) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxRect* newRect = new wxRect(dest); wxRect* newRect = new wxRect(dest);
obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true); obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -728,7 +728,7 @@ public:
"Get() -> (x,y)", "Get() -> (x,y)",
"Return x and y properties as a tuple.", ""); "Return x and y properties as a tuple.", "");
PyObject* Get() { PyObject* Get() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x)); PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->m_x));
PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y)); PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->m_y));

4
wxPython/src/_image.i
View File

@@ -306,7 +306,7 @@ The method will then fill up the whole image with the colour given.", "");
unsigned char* buffer; unsigned char* buffer;
int size; int size;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size)) if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done; goto done;
@@ -360,7 +360,7 @@ The method will then fill up the whole image with the colour given.", "");
unsigned char* buffer; unsigned char* buffer;
int size; int size;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size)) if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done; goto done;

2
wxPython/src/_joystick.i
View File

@@ -48,7 +48,7 @@ enum
class wxJoystick : public wxObject { class wxJoystick : public wxObject {
public: public:
wxJoystick(int joystick = wxJOYSTICK1) { wxJoystick(int joystick = wxJOYSTICK1) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, PyErr_SetString(PyExc_NotImplementedError,
"wxJoystick is not available on this platform."); "wxJoystick is not available on this platform.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

2
wxPython/src/_listctrl.i
View File

@@ -345,7 +345,7 @@ EVT_LIST_SET_INFO = wx._deprecated(EVT_LIST_SET_INFO)
static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) { static int wxCALLBACK wxPyListCtrl_SortItems(long item1, long item2, long funcPtr) {
int retval = 0; int retval = 0;
PyObject* func = (PyObject*)funcPtr; PyObject* func = (PyObject*)funcPtr;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* args = Py_BuildValue("(ii)", item1, item2); PyObject* args = Py_BuildValue("(ii)", item1, item2);
PyObject* result = PyEval_CallObject(func, args); PyObject* result = PyEval_CallObject(func, args);

4
wxPython/src/_log.i
View File

@@ -346,7 +346,7 @@ public:
virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) { virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) { if ((found = wxPyCBH_findCallback(m_myInst, "DoLog"))) {
PyObject* s = wx2PyString(szString); PyObject* s = wx2PyString(szString);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iOi)", level, s, t));
@@ -359,7 +359,7 @@ public:
virtual void DoLogString(const wxChar *szString, time_t t) { virtual void DoLogString(const wxChar *szString, time_t t) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) { if ((found = wxPyCBH_findCallback(m_myInst, "DoLogString"))) {
PyObject* s = wx2PyString(szString); PyObject* s = wx2PyString(szString);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", s, t));

4
wxPython/src/_mimetype.i
View File

@@ -190,7 +190,7 @@ public:
iconIndex = loc.GetIndex(); iconIndex = loc.GetIndex();
#endif #endif
// Make a tuple and put the values in it // Make a tuple and put the values in it
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(3); PyObject* tuple = PyTuple_New(3);
PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc), PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(loc),
wxT("wxIcon"), true)); wxT("wxIcon"), true));
@@ -250,7 +250,7 @@ public:
wxArrayString commands; wxArrayString commands;
if (self->GetAllCommands(&verbs, &commands, if (self->GetAllCommands(&verbs, &commands,
wxFileType::MessageParameters(filename, mimetype))) { wxFileType::MessageParameters(filename, mimetype))) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tuple = PyTuple_New(2); PyObject* tuple = PyTuple_New(2);
PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs)); PyTuple_SetItem(tuple, 0, wxArrayString2PyList_helper(verbs));
PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands)); PyTuple_SetItem(tuple, 1, wxArrayString2PyList_helper(commands));

4
wxPython/src/_pen.i
View File

@@ -56,7 +56,7 @@ public:
PyObject* GetDashes() { PyObject* GetDashes() {
wxDash* dashes; wxDash* dashes;
int count = self->GetDashes(&dashes); int count = self->GetDashes(&dashes);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* retval = PyList_New(0); PyObject* retval = PyList_New(0);
for (int x=0; x<count; x++) { for (int x=0; x<count; x++) {
PyObject* pyint = PyInt_FromLong(dashes[x]); PyObject* pyint = PyInt_FromLong(dashes[x]);
@@ -68,7 +68,7 @@ public:
} }
void _SetDashes(PyObject* _self, PyObject* pyDashes) { void _SetDashes(PyObject* _self, PyObject* pyDashes) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
int size = PyList_Size(pyDashes); int size = PyList_Size(pyDashes);
wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes); wxDash* dashes = (wxDash*)byte_LIST_helper(pyDashes);

8
wxPython/src/_printfw.i
View File

@@ -107,7 +107,7 @@ public:
%extend { %extend {
PyObject* GetPrivData() { PyObject* GetPrivData() {
PyObject* data; PyObject* data;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = PyString_FromStringAndSize(self->GetPrivData(), data = PyString_FromStringAndSize(self->GetPrivData(),
self->GetPrivDataLen()); self->GetPrivDataLen());
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -121,7 +121,7 @@ public:
return /* NULL */ ; return /* NULL */ ;
} }
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
self->SetPrivData(PyString_AS_STRING(data), PyString_GET_SIZE(data)); self->SetPrivData(PyString_AS_STRING(data), PyString_GET_SIZE(data));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -353,7 +353,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
bool hadErr = false; bool hadErr = false;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) { if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) {
PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) { if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
@@ -621,7 +621,7 @@ public:
bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \ bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \
bool rval=false; \ bool rval=false; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* win = wxPyMake_wxObject(a,false); \ PyObject* win = wxPyMake_wxObject(a,false); \
PyObject* dc = wxPyMake_wxObject(&b,false); \ PyObject* dc = wxPyMake_wxObject(&b,false); \

24
wxPython/src/_sizers.i
View File

@@ -56,7 +56,7 @@ methods are called.
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -74,7 +74,7 @@ methods are called.
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -91,7 +91,7 @@ methods are called.
{ {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
if ( userData ) { if ( userData ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -490,7 +490,7 @@ public:
PyObject* userData=NULL) { PyObject* userData=NULL) {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( userData && (info.window || info.sizer || info.gotSize) ) if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
@@ -521,7 +521,7 @@ the item at index *before*. See `Add` for a description of the parameters.", ""
int border=0, PyObject* userData=NULL) { int border=0, PyObject* userData=NULL) {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( userData && (info.window || info.sizer || info.gotSize) ) if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
@@ -553,7 +553,7 @@ this sizer. See `Add` for a description of the parameters.", "");
PyObject* userData=NULL) { PyObject* userData=NULL) {
wxPyUserData* data = NULL; wxPyUserData* data = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, true, false);
if ( userData && (info.window || info.sizer || info.gotSize) ) if ( userData && (info.window || info.sizer || info.gotSize) )
data = new wxPyUserData(userData); data = new wxPyUserData(userData);
@@ -589,7 +589,7 @@ and removed.", "
instead. instead.
"); ");
bool Remove(PyObject* item) { bool Remove(PyObject* item) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
@@ -611,7 +611,7 @@ do so. The *item* parameter can be either a window, a sizer, or the
zero-based index of the item to be detached. Returns True if the child item zero-based index of the item to be detached. Returns True if the child item
was found and detached.", ""); was found and detached.", "");
bool Detach(PyObject* item) { bool Detach(PyObject* item) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
@@ -631,7 +631,7 @@ was found and detached.", "");
parameter can be either a window, a sizer, or the zero-based index of parameter can be either a window, a sizer, or the zero-based index of
the item to be detached.", ""); the item to be detached.", "");
wxSizerItem* GetItem(PyObject* item) { wxSizerItem* GetItem(PyObject* item) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
@@ -646,7 +646,7 @@ the item to be detached.", "");
void _SetItemMinSize(PyObject* item, const wxSize& size) { void _SetItemMinSize(PyObject* item, const wxSize& size) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
@@ -889,7 +889,7 @@ parameter can be either a window, a sizer, or the zero-based index of
the item. Use the recursive parameter to show or hide an item in a the item. Use the recursive parameter to show or hide an item in a
subsizer. Returns True if the item was found.", ""); subsizer. Returns True if the item was found.", "");
bool Show(PyObject* item, bool show = true, bool recursive=false) { bool Show(PyObject* item, bool show = true, bool recursive=false) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
@@ -909,7 +909,7 @@ item disappear or reappear, use Show followed by `Layout`. The *item*
parameter can be either a window, a sizer, or the zero-based index of parameter can be either a window, a sizer, or the zero-based index of
the item.", ""); the item.", "");
bool IsShown(PyObject* item) { bool IsShown(PyObject* item) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, false);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )

12
wxPython/src/_sound.i
View File

@@ -38,19 +38,19 @@ class wxSound : public wxObject
{ {
public: public:
wxSound() { wxSound() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform."); "wxSound is not available on this platform.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
wxSound(const wxString&/*, bool*/) { wxSound(const wxString&/*, bool*/) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform."); "wxSound is not available on this platform.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
wxSound(int, const wxByte*) { wxSound(int, const wxByte*) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, PyErr_SetString(PyExc_NotImplementedError,
"wxSound is not available on this platform."); "wxSound is not available on this platform.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -90,7 +90,7 @@ public:
unsigned char* buffer; int size; unsigned char* buffer; int size;
wxSound *sound = NULL; wxSound *sound = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size)) if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done; goto done;
sound = new wxSound(size, buffer); sound = new wxSound(size, buffer);
@@ -113,7 +113,7 @@ public:
int size; int size;
bool rv = false; bool rv = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (!PyArg_Parse(data, "t#", &buffer, &size)) if (!PyArg_Parse(data, "t#", &buffer, &size))
goto done; goto done;
rv = self->Create(size, buffer); rv = self->Create(size, buffer);
@@ -121,7 +121,7 @@ public:
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return rv; return rv;
%#else %#else
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_NotImplementedError, PyErr_SetString(PyExc_NotImplementedError,
"Create from data is not available on this platform."); "Create from data is not available on this platform.");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

2
wxPython/src/_taskbar.i
View File

@@ -69,7 +69,7 @@ public:
wxMenu* CreatePopupMenu() { wxMenu* CreatePopupMenu() {
wxMenu *rval = NULL; wxMenu *rval = NULL;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) { if ((found = wxPyCBH_findCallback(m_myInst, "CreatePopupMenu"))) {
PyObject* ro; PyObject* ro;
wxMenu* ptr; wxMenu* ptr;

2
wxPython/src/_timer.i
View File

@@ -45,7 +45,7 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
void wxPyTimer::Notify() { void wxPyTimer::Notify() {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "Notify"))) if ((found = wxPyCBH_findCallback(m_myInst, "Notify")))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

10
wxPython/src/_treectrl.i
View File

@@ -289,7 +289,7 @@ public:
const wxTreeItemId& item2) { const wxTreeItemId& item2) {
int rval = 0; int rval = 0;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnCompareItems"))) {
PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), false); PyObject *o1 = wxPyConstructObject((void*)&item1, wxT("wxTreeItemId"), false);
PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), false); PyObject *o2 = wxPyConstructObject((void*)&item2, wxT("wxTreeItemId"), false);
@@ -509,7 +509,7 @@ public:
// NB: this operation is expensive and can take a long time for a // NB: this operation is expensive and can take a long time for a
// control with a lot of items (~ O(number of items)). // control with a lot of items (~ O(number of items)).
PyObject* GetSelections() { PyObject* GetSelections() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* rval = PyList_New(0); PyObject* rval = PyList_New(0);
wxArrayTreeItemIds array; wxArrayTreeItemIds array;
size_t num, x; size_t num, x;
@@ -539,7 +539,7 @@ public:
PyObject* GetFirstChild(const wxTreeItemId& item) { PyObject* GetFirstChild(const wxTreeItemId& item) {
void* cookie = 0; void* cookie = 0;
wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -554,7 +554,7 @@ public:
// passed to GetNextChild in order to continue the search. // passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) { PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie)); wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), true));
PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void"))); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
@@ -707,7 +707,7 @@ value is set to a bitmask of wxTREE_HITTEST_xxx constants.
PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) { PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = false) {
wxRect rect; wxRect rect;
if (self->GetBoundingRect(item, rect, textOnly)) { if (self->GetBoundingRect(item, rect, textOnly)) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxRect* r = new wxRect(rect); wxRect* r = new wxRect(rect);
PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), true); PyObject* val = wxPyConstructObject((void*)r, wxT("wxRect"), true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);

4
wxPython/src/_vscroll.i
View File

@@ -346,7 +346,7 @@ public:
PyObject* GetFirstSelected() { PyObject* GetFirstSelected() {
unsigned long cookie = 0; unsigned long cookie = 0;
int selected = self->GetFirstSelected(cookie); int selected = self->GetFirstSelected(cookie);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));
@@ -363,7 +363,7 @@ public:
// int GetNextSelected(unsigned long& cookie) const; // int GetNextSelected(unsigned long& cookie) const;
PyObject* GetNextSelected(unsigned long cookie) { PyObject* GetNextSelected(unsigned long cookie) {
int selected = self->GetNextSelected(cookie); int selected = self->GetNextSelected(cookie);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(selected));
PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(cookie));

2
wxPython/src/calendar.i
View File

@@ -396,7 +396,7 @@ The result codes are:
wxDateTime* date = new wxDateTime; wxDateTime* date = new wxDateTime;
wxDateTime::WeekDay wd; wxDateTime::WeekDay wd;
wxCalendarHitTestResult result = self->HitTest(pos, date, &wd); wxCalendarHitTestResult result = self->HitTest(pos, date, &wd);
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(3); PyObject* tup = PyTuple_New(3);
PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(result)); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(result));
PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(date, wxT("wxDateTime"), 1)); PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(date, wxT("wxDateTime"), 1));

4
wxPython/src/drawlist.cpp
View File

@@ -30,7 +30,7 @@ void wxPyDrawList_SetAPIPtr()
PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw, PyObject* wxPyDrawXXXList(wxDC& dc, wxPyDrawListOp_t doDraw,
PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes) PyObject* pyCoords, PyObject* pyPens, PyObject* pyBrushes)
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
bool isFastSeq = PyList_Check(pyCoords) || PyTuple_Check(pyCoords); bool isFastSeq = PyList_Check(pyCoords) || PyTuple_Check(pyCoords);
bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens); bool isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
@@ -215,7 +215,7 @@ bool wxPyDrawXXXPolygon(wxDC& dc, PyObject* coords)
PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList) PyObject* wxPyDrawTextList(wxDC& dc, PyObject* textList, PyObject* pyPoints, PyObject* foregroundList, PyObject* backgroundList)
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints); bool isFastSeq = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
bool isFastText = PyList_Check(textList) || PyTuple_Check(textList); bool isFastText = PyList_Check(textList) || PyTuple_Check(textList);

74
wxPython/src/grid.i
View File

@@ -99,7 +99,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \ wxGridCellAttr* CBNAME(int a, int b, wxGridCellAttr::wxAttrKind c) { \
wxGridCellAttr* rval = NULL; \ wxGridCellAttr* rval = NULL; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
wxGridCellAttr* ptr; \ wxGridCellAttr* ptr; \
@@ -123,7 +123,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \ #define PYCALLBACK__GCAINTINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int a, int b) { \ void CBNAME(wxGridCellAttr *attr, int a, int b) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
bool found; \ bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \
@@ -142,7 +142,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__GCAINT(PCLASS, CBNAME) \ #define PYCALLBACK__GCAINT(PCLASS, CBNAME) \
void CBNAME(wxGridCellAttr *attr, int val) { \ void CBNAME(wxGridCellAttr *attr, int val) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
bool found; \ bool found; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \ PyObject* obj = wxPyMake_wxGridCellAttr(attr,false); \
@@ -161,7 +161,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_INT__pure(CBNAME) \ #define PYCALLBACK_INT__pure(CBNAME) \
int CBNAME() { \ int CBNAME() { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
int rval = 0; \ int rval = 0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
@@ -173,7 +173,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \ #define PYCALLBACK_BOOL_INTINT_pure(CBNAME) \
bool CBNAME(int a, int b) { \ bool CBNAME(int a, int b) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
bool rval = 0; \ bool rval = 0; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)",a,b)); \
@@ -184,7 +184,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \ #define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
wxString CBNAME(int a, int b) { \ wxString CBNAME(int a, int b) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
wxString rval; \ wxString rval; \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* ro; \ PyObject* ro; \
@@ -201,7 +201,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__INTINTSTRING_pure(CBNAME) \ #define PYCALLBACK__INTINTSTRING_pure(CBNAME) \
void CBNAME(int a, int b, const wxString& c) { \ void CBNAME(int a, int b, const wxString& c) { \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \ if (wxPyCBH_findCallback(m_myInst, #CBNAME)) { \
PyObject* s = wx2PyString(c); \ PyObject* s = wx2PyString(c); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
@@ -214,7 +214,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \ #define PYCALLBACK_STRING_INTINT(PCLASS, CBNAME) \
wxString CBNAME(int a, int b) { \ wxString CBNAME(int a, int b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
wxString rval; \ wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
@@ -238,7 +238,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(int a, int b, const wxString& c) { \ bool CBNAME(int a, int b, const wxString& c) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(c); \ PyObject* s = wx2PyString(c); \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",a,b,s));\
@@ -260,7 +260,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
long CBNAME(int a, int b) { \ long CBNAME(int a, int b) { \
long rval; \ long rval; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -278,7 +278,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(int a, int b) { \ bool CBNAME(int a, int b) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -295,7 +295,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \ #define PYCALLBACK_DOUBLE_INTINT(PCLASS, CBNAME) \
double CBNAME(int a, int b) { \ double CBNAME(int a, int b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
double rval; \ double rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
@@ -320,7 +320,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__(PCLASS, CBNAME) \ #define PYCALLBACK__(PCLASS, CBNAME) \
void CBNAME() { \ void CBNAME() { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -338,7 +338,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(size_t a, size_t b) { \ bool CBNAME(size_t a, size_t b) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -356,7 +356,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(size_t a) { \ bool CBNAME(size_t a) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(i)", a)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -372,7 +372,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \ #define PYCALLBACK_STRING_INT(PCLASS, CBNAME) \
wxString CBNAME(int a) { \ wxString CBNAME(int a) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
wxString rval; \ wxString rval; \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* ro; \ PyObject* ro; \
@@ -395,7 +395,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \ #define PYCALLBACK__INTSTRING(PCLASS, CBNAME) \
void CBNAME(int a, const wxString& c) { \ void CBNAME(int a, const wxString& c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
PyObject* s = wx2PyString(c); \ PyObject* s = wx2PyString(c); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)",a,s)); \
@@ -416,7 +416,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME() { \ bool CBNAME() { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \ rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -433,7 +433,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \ #define PYCALLBACK__SIZETINT(PCLASS, CBNAME) \
void CBNAME(size_t a, int b) { \ void CBNAME(size_t a, int b) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(ii)", a,b)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -450,7 +450,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \ #define PYCALLBACK__INTINTLONG(PCLASS, CBNAME) \
void CBNAME(int a, int b, long c) { \ void CBNAME(int a, int b, long c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -467,7 +467,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \ #define PYCALLBACK__INTINTDOUBLE(PCLASS, CBNAME) \
void CBNAME(int a, int b, double c) { \ void CBNAME(int a, int b, double c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iif)", a,b,c)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -483,7 +483,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \ #define PYCALLBACK__INTINTBOOL(PCLASS, CBNAME) \
void CBNAME(int a, int b, bool c) { \ void CBNAME(int a, int b, bool c) { \
bool found; \ bool found; \
bool blocked = wxPyBeginBlockThreads(); \ wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", a,b,c)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
@@ -592,7 +592,7 @@ public:
void Draw(wxGrid& grid, wxGridCellAttr& attr, void Draw(wxGrid& grid, wxGridCellAttr& attr,
wxDC& dc, const wxRect& rect, wxDC& dc, const wxRect& rect,
int row, int col, bool isSelected) { int row, int col, bool isSelected) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Draw")) { if (wxPyCBH_findCallback(m_myInst, "Draw")) {
PyObject* go = wxPyMake_wxObject(&grid,false); PyObject* go = wxPyMake_wxObject(&grid,false);
PyObject* dco = wxPyMake_wxObject(&dc,false); PyObject* dco = wxPyMake_wxObject(&dc,false);
@@ -612,7 +612,7 @@ public:
wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc, wxSize GetBestSize(wxGrid& grid, wxGridCellAttr& attr, wxDC& dc,
int row, int col) { int row, int col) {
wxSize rval; wxSize rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) { if (wxPyCBH_findCallback(m_myInst, "GetBestSize")) {
PyObject* ro; PyObject* ro;
wxSize* ptr; wxSize* ptr;
@@ -655,7 +655,7 @@ public:
wxGridCellRenderer *Clone() const { wxGridCellRenderer *Clone() const {
wxGridCellRenderer* rval = NULL; wxGridCellRenderer* rval = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Clone")) { if (wxPyCBH_findCallback(m_myInst, "Clone")) {
PyObject* ro; PyObject* ro;
wxGridCellRenderer* ptr; wxGridCellRenderer* ptr;
@@ -809,7 +809,7 @@ public:
wxPyGridCellEditor() : wxGridCellEditor() {} wxPyGridCellEditor() : wxGridCellEditor() {}
void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) { void Create(wxWindow* parent, wxWindowID id, wxEvtHandler* evtHandler) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Create")) { if (wxPyCBH_findCallback(m_myInst, "Create")) {
PyObject* po = wxPyMake_wxObject(parent,false); PyObject* po = wxPyMake_wxObject(parent,false);
PyObject* eo = wxPyMake_wxObject(evtHandler,false); PyObject* eo = wxPyMake_wxObject(evtHandler,false);
@@ -823,7 +823,7 @@ public:
void BeginEdit(int row, int col, wxGrid* grid) { void BeginEdit(int row, int col, wxGrid* grid) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) { if (wxPyCBH_findCallback(m_myInst, "BeginEdit")) {
PyObject* go = wxPyMake_wxObject(grid,false); PyObject* go = wxPyMake_wxObject(grid,false);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
@@ -835,7 +835,7 @@ public:
bool EndEdit(int row, int col, wxGrid* grid) { bool EndEdit(int row, int col, wxGrid* grid) {
bool rv = false; bool rv = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "EndEdit")) { if (wxPyCBH_findCallback(m_myInst, "EndEdit")) {
PyObject* go = wxPyMake_wxObject(grid,false); PyObject* go = wxPyMake_wxObject(grid,false);
rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go)); rv = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)", row, col, go));
@@ -848,7 +848,7 @@ public:
wxGridCellEditor* Clone() const { wxGridCellEditor* Clone() const {
wxGridCellEditor* rval = NULL; wxGridCellEditor* rval = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "Clone")) { if (wxPyCBH_findCallback(m_myInst, "Clone")) {
PyObject* ro; PyObject* ro;
wxGridCellEditor* ptr; wxGridCellEditor* ptr;
@@ -866,7 +866,7 @@ public:
void Show(bool show, wxGridCellAttr *attr) { void Show(bool show, wxGridCellAttr *attr) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) { if ((found = wxPyCBH_findCallback(m_myInst, "Show"))) {
PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", show, ao));
@@ -883,7 +883,7 @@ public:
void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) { void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) { if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
PyObject* ao = wxPyMake_wxGridCellAttr(attr,false); PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0); PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);
@@ -1252,7 +1252,7 @@ public:
wxString GetValue(int row, int col) { wxString GetValue(int row, int col) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxString rval; wxString rval;
if (wxPyCBH_findCallback(m_myInst, "GetValue")) { if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro; PyObject* ro;
@@ -1272,7 +1272,7 @@ public:
} }
void SetValue(int row, int col, const wxString& val) { void SetValue(int row, int col, const wxString& val) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) { if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
PyObject* s = wx2PyString(val); PyObject* s = wx2PyString(val);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iiO)",row,col,s));
@@ -1286,7 +1286,7 @@ public:
// the GetValue and SetValue python methods. // the GetValue and SetValue python methods.
long GetValueAsLong( int row, int col ) { long GetValueAsLong( int row, int col ) {
long rval = 0; long rval = 0;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetValue")) { if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro; PyObject* ro;
PyObject* num; PyObject* num;
@@ -1306,7 +1306,7 @@ public:
double GetValueAsDouble( int row, int col ) { double GetValueAsDouble( int row, int col ) {
double rval = 0.0; double rval = 0.0;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "GetValue")) { if (wxPyCBH_findCallback(m_myInst, "GetValue")) {
PyObject* ro; PyObject* ro;
PyObject* num; PyObject* num;
@@ -1329,7 +1329,7 @@ public:
} }
void SetValueAsLong( int row, int col, long value ) { void SetValueAsLong( int row, int col, long value ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) { if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iii)", row, col, value));
} }
@@ -1337,7 +1337,7 @@ public:
} }
void SetValueAsDouble( int row, int col, double value ) { void SetValueAsDouble( int row, int col, double value ) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "SetValue")) { if (wxPyCBH_findCallback(m_myInst, "SetValue")) {
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iid)", row, col, value));
} }

104
wxPython/src/helpers.cpp
View File

@@ -61,6 +61,7 @@ bool wxPyDoingCleanup = false;
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
#if !wxPyUSE_GIL_STATE
struct wxPyThreadState { struct wxPyThreadState {
unsigned long tid; unsigned long tid;
PyThreadState* tstate; PyThreadState* tstate;
@@ -76,7 +77,10 @@ WX_DEFINE_OBJARRAY(wxPyThreadStateArray);
wxPyThreadStateArray* wxPyTStates = NULL; wxPyThreadStateArray* wxPyTStates = NULL;
wxMutex* wxPyTMutex = NULL; wxMutex* wxPyTMutex = NULL;
#endif #endif
#endif
#define DEFAULTENCODING_SIZE 64 #define DEFAULTENCODING_SIZE 64
static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii"; static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii";
@@ -99,8 +103,8 @@ BOOL WINAPI DllMain(
LPVOID lpvReserved // reserved LPVOID lpvReserved // reserved
) )
{ {
// If wxPython is embedded in another wxWindows app then // If wxPython is embedded in another wxWidgets app then
// the inatance has already been set. // the instance has already been set.
if (! wxGetInstance()) if (! wxGetInstance())
wxSetInstance(hinstDLL); wxSetInstance(hinstDLL);
return true; return true;
@@ -150,7 +154,7 @@ int wxPyApp::MainLoop() {
bool wxPyApp::OnInitGui() { bool wxPyApp::OnInitGui() {
bool rval=true; bool rval=true;
wxApp::OnInitGui(); // in this case always call the base class version wxApp::OnInitGui(); // in this case always call the base class version
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnInitGui")) if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -160,7 +164,7 @@ bool wxPyApp::OnInitGui() {
int wxPyApp::OnExit() { int wxPyApp::OnExit() {
int rval=0; int rval=0;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "OnExit")) if (wxPyCBH_findCallback(m_myInst, "OnExit"))
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -191,7 +195,7 @@ void wxPyApp::OnAssert(const wxChar *file,
// If the OnAssert is overloaded in the Python class then call it... // If the OnAssert is overloaded in the Python class then call it...
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) {
PyObject* fso = wx2PyString(file); PyObject* fso = wx2PyString(file);
PyObject* cso = wx2PyString(file); PyObject* cso = wx2PyString(file);
@@ -225,7 +229,7 @@ void wxPyApp::OnAssert(const wxChar *file,
} }
// set the exception // set the exception
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* s = wx2PyString(buf); PyObject* s = wx2PyString(buf);
PyErr_SetObject(wxPyAssertionError, s); PyErr_SetObject(wxPyAssertionError, s);
Py_DECREF(s); Py_DECREF(s);
@@ -260,7 +264,7 @@ void wxPyApp::OnAssert(const wxChar *file,
// For catching Apple Events // For catching Apple Events
void wxPyApp::MacOpenFile(const wxString &fileName) void wxPyApp::MacOpenFile(const wxString &fileName)
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) { if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
PyObject* s = wx2PyString(fileName); PyObject* s = wx2PyString(fileName);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
@@ -271,7 +275,7 @@ void wxPyApp::MacOpenFile(const wxString &fileName)
void wxPyApp::MacPrintFile(const wxString &fileName) void wxPyApp::MacPrintFile(const wxString &fileName)
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) { if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
PyObject* s = wx2PyString(fileName); PyObject* s = wx2PyString(fileName);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
@@ -282,7 +286,7 @@ void wxPyApp::MacPrintFile(const wxString &fileName)
void wxPyApp::MacNewFile() void wxPyApp::MacNewFile()
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "MacNewFile")) if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -290,7 +294,7 @@ void wxPyApp::MacNewFile()
void wxPyApp::MacReopenApp() void wxPyApp::MacReopenApp()
{ {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (wxPyCBH_findCallback(m_myInst, "MacReopenApp")) if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -383,7 +387,8 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) {
void wxPyApp::_BootstrapApp() void wxPyApp::_BootstrapApp()
{ {
static bool haveInitialized = false; static bool haveInitialized = false;
bool result, blocked; bool result;
wxPyBlock_t blocked;
PyObject* retval = NULL; PyObject* retval = NULL;
PyObject* pyint = NULL; PyObject* pyint = NULL;
@@ -540,12 +545,14 @@ void __wxPyPreStart(PyObject* moduleDict)
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
PyEval_InitThreads(); PyEval_InitThreads();
#if !wxPyUSE_GIL_STATE
wxPyTStates = new wxPyThreadStateArray; wxPyTStates = new wxPyThreadStateArray;
wxPyTMutex = new wxMutex; wxPyTMutex = new wxMutex;
// Save the current (main) thread state in our array // Save the current (main) thread state in our array
PyThreadState* tstate = wxPyBeginAllowThreads(); PyThreadState* tstate = wxPyBeginAllowThreads();
wxPyEndAllowThreads(tstate); wxPyEndAllowThreads(tstate);
#endif
#endif #endif
// Ensure that the build options in the DLL (or whatever) match this build // Ensure that the build options in the DLL (or whatever) match this build
@@ -566,12 +573,14 @@ void __wxPyCleanup() {
wxEntryCleanup(); wxEntryCleanup();
} }
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
#if !wxPyUSE_GIL_STATE
delete wxPyTMutex; delete wxPyTMutex;
wxPyTMutex = NULL; wxPyTMutex = NULL;
wxPyTStates->Empty(); wxPyTStates->Empty();
delete wxPyTStates; delete wxPyTStates;
wxPyTStates = NULL; wxPyTStates = NULL;
#endif #endif
#endif
} }
@@ -868,7 +877,7 @@ bool wxPyCheckForApp() {
void wxPyUserData_dtor(wxPyUserData* self) { void wxPyUserData_dtor(wxPyUserData* self) {
if (! wxPyDoingCleanup) { if (! wxPyDoingCleanup) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(self->m_obj); Py_DECREF(self->m_obj);
self->m_obj = NULL; self->m_obj = NULL;
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -880,7 +889,7 @@ void wxPyClientData_dtor(wxPyClientData* self) {
if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python if (! wxPyDoingCleanup) { // Don't do it during cleanup as Python
// may have already garbage collected the object... // may have already garbage collected the object...
if (self->m_incRef) { if (self->m_incRef) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(self->m_obj); Py_DECREF(self->m_obj);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -902,7 +911,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
static PyObject* deadObjectClass = NULL; static PyObject* deadObjectClass = NULL;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (deadObjectClass == NULL) { if (deadObjectClass == NULL) {
deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject"); deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
// TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads, // TODO: Can not wxASSERT here because inside a wxPyBeginBlock Threads,
@@ -1050,6 +1059,8 @@ PyObject* wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) {
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
#if !wxPyUSE_GIL_STATE
inline inline
unsigned long wxPyGetCurrentThreadId() { unsigned long wxPyGetCurrentThreadId() {
return wxThread::GetCurrentId(); return wxThread::GetCurrentId();
@@ -1110,6 +1121,7 @@ void wxPySaveThreadState(PyThreadState* tstate) {
} }
#endif #endif
#endif
@@ -1119,7 +1131,9 @@ void wxPySaveThreadState(PyThreadState* tstate) {
PyThreadState* wxPyBeginAllowThreads() { PyThreadState* wxPyBeginAllowThreads() {
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
PyThreadState* saved = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS; PyThreadState* saved = PyEval_SaveThread(); // Py_BEGIN_ALLOW_THREADS;
#if !wxPyUSE_GIL_STATE
wxPySaveThreadState(saved); wxPySaveThreadState(saved);
#endif
return saved; return saved;
#else #else
return NULL; return NULL;
@@ -1137,17 +1151,18 @@ void wxPyEndAllowThreads(PyThreadState* saved) {
// Calls from wxWindows back to Python code, or even any PyObject // Calls from wxWindows back to Python code, or even any PyObject
// manipulations, PyDECREF's and etc. are wrapped in calls to these functions: // manipulations, PyDECREF's and etc. are wrapped in calls to these functions:
bool wxPyBeginBlockThreads() { wxPyBlock_t wxPyBeginBlockThreads() {
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
// This works in for 2.3, maybe a good alternative to find the needed tstate? #if wxPyUSE_GIL_STATE
// PyThreadState *check = PyGILState_GetThisThreadState(); PyGILState_STATE state = PyGILState_Ensure();
return state;
#else
PyThreadState *current = _PyThreadState_Current; PyThreadState *current = _PyThreadState_Current;
// Only block if there wasn't already a tstate, or if the current one is // Only block if there wasn't already a tstate, or if the current one is
// not the one we are wanting to change to. This should prevent deadlock // not the one we are wanting to change to. This should prevent deadlock
// if there are nested calls to wxPyBeginBlockThreads // if there are nested calls to wxPyBeginBlockThreads
bool blocked = false; wxPyBlock_t blocked = false;
wxPyThreadState* tstate = wxPyGetThreadState(); wxPyThreadState* tstate = wxPyGetThreadState();
if (current != tstate->tstate) { if (current != tstate->tstate) {
PyEval_RestoreThread(tstate->tstate); PyEval_RestoreThread(tstate->tstate);
@@ -1155,11 +1170,17 @@ bool wxPyBeginBlockThreads() {
} }
return blocked; return blocked;
#endif #endif
#else
return false;
#endif
} }
void wxPyEndBlockThreads(bool blocked) { void wxPyEndBlockThreads(wxPyBlock_t blocked) {
#ifdef WXP_WITH_THREAD #ifdef WXP_WITH_THREAD
#if wxPyUSE_GIL_STATE
PyGILState_Release(blocked);
#else
// Only unblock if we blocked in the last call to wxPyBeginBlockThreads. // Only unblock if we blocked in the last call to wxPyBeginBlockThreads.
// The value of blocked passed in needs to be the same as that returned // The value of blocked passed in needs to be the same as that returned
// from wxPyBeginBlockThreads at the same nesting level. // from wxPyBeginBlockThreads at the same nesting level.
@@ -1167,6 +1188,7 @@ void wxPyEndBlockThreads(bool blocked) {
PyEval_SaveThread(); PyEval_SaveThread();
} }
#endif #endif
#endif
} }
@@ -1204,7 +1226,7 @@ PyObject* wxPyInputStream::read(int size) {
// check if we have a real wxInputStream to work with // check if we have a real wxInputStream to work with
if (!m_wxis) { if (!m_wxis) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream"); PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
@@ -1223,7 +1245,7 @@ PyObject* wxPyInputStream::read(int size) {
} }
// error check // error check
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxStreamError err = m_wxis->GetLastError(); wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
@@ -1245,7 +1267,7 @@ PyObject* wxPyInputStream::readline(int size) {
// check if we have a real wxInputStream to work with // check if we have a real wxInputStream to work with
if (!m_wxis) { if (!m_wxis) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
@@ -1258,7 +1280,7 @@ PyObject* wxPyInputStream::readline(int size) {
} }
// errorcheck // errorcheck
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxStreamError err = m_wxis->GetLastError(); wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
@@ -1277,19 +1299,19 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
// check if we have a real wxInputStream to work with // check if we have a real wxInputStream to work with
if (!m_wxis) { if (!m_wxis) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream"); PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
} }
// init list // init list
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pylist = PyList_New(0); pylist = PyList_New(0);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if (!pylist) { if (!pylist) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyErr_NoMemory(); PyErr_NoMemory();
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
@@ -1300,12 +1322,12 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) { for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) {
PyObject* s = this->readline(); PyObject* s = this->readline();
if (s == NULL) { if (s == NULL) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(pylist); Py_DECREF(pylist);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
return NULL; return NULL;
} }
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyList_Append(pylist, s); PyList_Append(pylist, s);
i += PyString_Size(s); i += PyString_Size(s);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -1314,7 +1336,7 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
// error check // error check
wxStreamError err = m_wxis->GetLastError(); wxStreamError err = m_wxis->GetLastError();
if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) { if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(pylist); Py_DECREF(pylist);
PyErr_SetString(PyExc_IOError,"IOError in wxInputStream"); PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -1356,7 +1378,7 @@ wxPyCBInputStream::wxPyCBInputStream(const wxPyCBInputStream& other)
wxPyCBInputStream::~wxPyCBInputStream() { wxPyCBInputStream::~wxPyCBInputStream() {
bool blocked=false; wxPyBlock_t blocked;
if (m_block) blocked = wxPyBeginBlockThreads(); if (m_block) blocked = wxPyBeginBlockThreads();
Py_XDECREF(m_read); Py_XDECREF(m_read);
Py_XDECREF(m_seek); Py_XDECREF(m_seek);
@@ -1366,7 +1388,7 @@ wxPyCBInputStream::~wxPyCBInputStream() {
wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) { wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
bool blocked=false; wxPyBlock_t blocked;
if (block) blocked = wxPyBeginBlockThreads(); if (block) blocked = wxPyBeginBlockThreads();
PyObject* read = getMethod(py, "read"); PyObject* read = getMethod(py, "read");
@@ -1424,7 +1446,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) {
if (bufsize == 0) if (bufsize == 0)
return 0; return 0;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* arglist = Py_BuildValue("(i)", bufsize); PyObject* arglist = Py_BuildValue("(i)", bufsize);
PyObject* result = PyEval_CallObject(m_read, arglist); PyObject* result = PyEval_CallObject(m_read, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
@@ -1453,7 +1475,7 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) {
wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) { wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* arglist = PyTuple_New(2); PyObject* arglist = PyTuple_New(2);
if (sizeof(wxFileOffset) > sizeof(long)) if (sizeof(wxFileOffset) > sizeof(long))
@@ -1474,7 +1496,7 @@ wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
wxFileOffset wxPyCBInputStream::OnSysTell() const { wxFileOffset wxPyCBInputStream::OnSysTell() const {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* arglist = Py_BuildValue("()"); PyObject* arglist = Py_BuildValue("()");
PyObject* result = PyEval_CallObject(m_tell, arglist); PyObject* result = PyEval_CallObject(m_tell, arglist);
Py_DECREF(arglist); Py_DECREF(arglist);
@@ -1505,7 +1527,7 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
} }
wxPyCallback::~wxPyCallback() { wxPyCallback::~wxPyCallback() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(m_func); Py_DECREF(m_func);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
@@ -1523,7 +1545,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
PyObject* tuple; PyObject* tuple;
bool checkSkip = false; bool checkSkip = false;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxString className = event.GetClassInfo()->GetClassName(); wxString className = event.GetClassInfo()->GetClassName();
// If the event is one of these types then pass the original // If the event is one of these types then pass the original
@@ -1783,7 +1805,7 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu
void wxPyCBH_delete(wxPyCallbackHelper* cbh) { void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
if (cbh->m_incRef) { if (cbh->m_incRef) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_XDECREF(cbh->m_self); Py_XDECREF(cbh->m_self);
Py_XDECREF(cbh->m_class); Py_XDECREF(cbh->m_class);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
@@ -1804,14 +1826,14 @@ wxPyEvtSelfRef::wxPyEvtSelfRef() {
} }
wxPyEvtSelfRef::~wxPyEvtSelfRef() { wxPyEvtSelfRef::~wxPyEvtSelfRef() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (m_cloned) if (m_cloned)
Py_DECREF(m_self); Py_DECREF(m_self);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
} }
void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) { void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if (m_cloned) if (m_cloned)
Py_DECREF(m_self); Py_DECREF(m_self);
m_self = self; m_self = self;
@@ -1878,7 +1900,7 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) {
wxObject* wxObj; wxObject* wxObj;
wxNode* node = list->GetFirst(); wxNode* node = list->GetFirst();
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
pyList = PyList_New(0); pyList = PyList_New(0);
while (node) { while (node) {
wxObj = node->GetData(); wxObj = node->GetData();

12
wxPython/src/html.i
View File

@@ -329,7 +329,7 @@ public:
} }
void OnExit() { void OnExit() {
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
Py_DECREF(m_tagHandlerClass); Py_DECREF(m_tagHandlerClass);
m_tagHandlerClass = NULL; m_tagHandlerClass = NULL;
for (size_t x=0; x < m_objArray.GetCount(); x++) { for (size_t x=0; x < m_objArray.GetCount(); x++) {
@@ -343,7 +343,7 @@ public:
// Wave our magic wand... (if it works it's a miracle! ;-) // Wave our magic wand... (if it works it's a miracle! ;-)
// First, make a new instance of the tag handler // First, make a new instance of the tag handler
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
PyObject* arg = PyTuple_New(0); PyObject* arg = PyTuple_New(0);
PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg); PyObject* obj = PyObject_CallObject(m_tagHandlerClass, arg);
Py_DECREF(arg); Py_DECREF(arg);
@@ -647,7 +647,7 @@ public:
virtual bool CanRead(const wxFSFile& file) const { virtual bool CanRead(const wxFSFile& file) const {
bool rval = false; bool rval = false;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) { if ((found = wxPyCBH_findCallback(m_myInst, "CanRead"))) {
PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false); // cast away const PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false); // cast away const
rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
@@ -663,7 +663,7 @@ public:
virtual wxString ReadFile(const wxFSFile& file) const { virtual wxString ReadFile(const wxFSFile& file) const {
wxString rval; wxString rval;
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "ReadFile"))) { if ((found = wxPyCBH_findCallback(m_myInst, "ReadFile"))) {
PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false); // cast away const PyObject* obj = wxPyMake_wxObject((wxFSFile*)&file,false); // cast away const
PyObject* ro; PyObject* ro;
@@ -747,7 +747,7 @@ IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) { void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
bool found; bool found;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0); PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj)); wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", obj));
@@ -767,7 +767,7 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
wxString *redirect) const { wxString *redirect) const {
bool found; bool found;
wxHtmlOpeningStatus rval; wxHtmlOpeningStatus rval;
bool blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) { if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
PyObject* ro; PyObject* ro;
PyObject* s = wx2PyString(url); PyObject* s = wx2PyString(url);