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

A bit of cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-03-19 02:22:08 +00:00
parent ac288fac82
commit 80b6bf7c7c
2 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
wxPython/src/grid.i
View File

@@ -99,18 +99,18 @@ 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; \
wxPyBlock_t 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; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
if (ro) { \ if (ro) { \
if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \ if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \
rval = ptr; \ rval = ptr; \
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b, c); \ rval = PCLASS::CBNAME(a, b, c); \
return rval; \ return rval; \
@@ -119,14 +119,14 @@ 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) { \
wxPyBlock_t 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); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
Py_DECREF(obj); \ Py_DECREF(obj); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(attr, a, b); \ PCLASS::CBNAME(attr, a, b); \
} }
@@ -135,14 +135,14 @@ 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) { \
wxPyBlock_t 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); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
Py_DECREF(obj); \ Py_DECREF(obj); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(attr, val); \ PCLASS::CBNAME(attr, val); \
} }
@@ -151,11 +151,11 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_INT__pure(CBNAME) \ #define PYCALLBACK_INT__pure(CBNAME) \
int CBNAME() { \ int CBNAME() { \
wxPyBlock_t 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("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
@@ -163,18 +163,18 @@ 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) { \
wxPyBlock_t 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)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \ #define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
wxString CBNAME(int a, int b) { \ wxString CBNAME(int a, int b) { \
wxPyBlock_t 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; \
@@ -184,27 +184,27 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
#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) { \
wxPyBlock_t 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));\
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
} }
#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; \
wxPyBlock_t 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; \
@@ -214,7 +214,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b); \ rval = PCLASS::CBNAME(a, b); \
return rval; \ return rval; \
@@ -225,13 +225,13 @@ 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; \
wxPyBlock_t 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));\
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b,c); \ rval = PCLASS::CBNAME(a,b,c); \
return rval; \ return rval; \
@@ -244,10 +244,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
long CBNAME(int a, int b) { \ long CBNAME(int a, int b) { \
long rval; \ long rval; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -258,10 +258,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -272,7 +272,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; \
wxPyBlock_t 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; \
@@ -283,7 +283,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); Py_DECREF(str); \ Py_DECREF(ro); Py_DECREF(str); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b); \ rval = PCLASS::CBNAME(a, b); \
return rval; \ return rval; \
@@ -294,10 +294,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__(PCLASS, CBNAME) \ #define PYCALLBACK__(PCLASS, CBNAME) \
void CBNAME() { \ void CBNAME() { \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(); \ PCLASS::CBNAME(); \
} }
@@ -308,10 +308,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -323,10 +323,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(size_t a) { \ bool CBNAME(size_t a) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a); \ rval = PCLASS::CBNAME(a); \
return rval; \ return rval; \
@@ -336,7 +336,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; \
wxPyBlock_t 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; \
@@ -346,7 +346,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a); \ rval = PCLASS::CBNAME(a); \
return rval; \ return rval; \
@@ -356,13 +356,13 @@ 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; \
wxPyBlock_t 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)); \
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,c); \ PCLASS::CBNAME(a,c); \
} }
@@ -374,10 +374,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME() { \ bool CBNAME() { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(); \ rval = PCLASS::CBNAME(); \
return rval; \ return rval; \
@@ -388,10 +388,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b); \ PCLASS::CBNAME(a,b); \
} }
@@ -402,10 +402,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }
@@ -416,10 +416,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }
@@ -429,10 +429,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }

90
wxPython/src/gtk/grid_wrap.cpp
View File

@@ -2795,18 +2795,18 @@ 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; \
wxPyBlock_t 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; \
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \ ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iii)", a, b, c)); \
if (ro) { \ if (ro) { \
if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \ if (wxPyConvertSwigPtr(ro, (void **)&ptr, wxT("wxGridCellAttr"))) \
rval = ptr; \ rval = ptr; \
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b, c); \ rval = PCLASS::CBNAME(a, b, c); \
return rval; \ return rval; \
@@ -2815,14 +2815,14 @@ 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) { \
wxPyBlock_t 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); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oii)", obj, a, b)); \
Py_DECREF(obj); \ Py_DECREF(obj); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(attr, a, b); \ PCLASS::CBNAME(attr, a, b); \
} }
@@ -2831,14 +2831,14 @@ 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) { \
wxPyBlock_t 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); \
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \ wxPyCBH_callCallback(m_myInst, Py_BuildValue("(Oi)", obj, val)); \
Py_DECREF(obj); \ Py_DECREF(obj); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(attr, val); \ PCLASS::CBNAME(attr, val); \
} }
@@ -2847,11 +2847,11 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK_INT__pure(CBNAME) \ #define PYCALLBACK_INT__pure(CBNAME) \
int CBNAME() { \ int CBNAME() { \
wxPyBlock_t 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("()")); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
@@ -2859,18 +2859,18 @@ 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) { \
wxPyBlock_t 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)); \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
#define PYCALLBACK_STRING_INTINT_pure(CBNAME) \ #define PYCALLBACK_STRING_INTINT_pure(CBNAME) \
wxString CBNAME(int a, int b) { \ wxString CBNAME(int a, int b) { \
wxPyBlock_t 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; \
@@ -2880,27 +2880,27 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
return rval; \ return rval; \
} }
#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) { \
wxPyBlock_t 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));\
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
} }
#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; \
wxPyBlock_t 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; \
@@ -2910,7 +2910,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b); \ rval = PCLASS::CBNAME(a, b); \
return rval; \ return rval; \
@@ -2921,13 +2921,13 @@ 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; \
wxPyBlock_t 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));\
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b,c); \ rval = PCLASS::CBNAME(a,b,c); \
return rval; \ return rval; \
@@ -2940,10 +2940,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
long CBNAME(int a, int b) { \ long CBNAME(int a, int b) { \
long rval; \ long rval; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -2954,10 +2954,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -2968,7 +2968,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; \
wxPyBlock_t 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; \
@@ -2979,7 +2979,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); Py_DECREF(str); \ Py_DECREF(ro); Py_DECREF(str); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a, b); \ rval = PCLASS::CBNAME(a, b); \
return rval; \ return rval; \
@@ -2990,10 +2990,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
#define PYCALLBACK__(PCLASS, CBNAME) \ #define PYCALLBACK__(PCLASS, CBNAME) \
void CBNAME() { \ void CBNAME() { \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(); \ PCLASS::CBNAME(); \
} }
@@ -3004,10 +3004,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a,b); \ rval = PCLASS::CBNAME(a,b); \
return rval; \ return rval; \
@@ -3019,10 +3019,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME(size_t a) { \ bool CBNAME(size_t a) { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a); \ rval = PCLASS::CBNAME(a); \
return rval; \ return rval; \
@@ -3032,7 +3032,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; \
wxPyBlock_t 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; \
@@ -3042,7 +3042,7 @@ wxPyMake_TEMPLATE(wxGridTableBase)
Py_DECREF(ro); \ Py_DECREF(ro); \
} \ } \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(a); \ rval = PCLASS::CBNAME(a); \
return rval; \ return rval; \
@@ -3052,13 +3052,13 @@ 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; \
wxPyBlock_t 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)); \
Py_DECREF(s); \ Py_DECREF(s); \
} \ } \
wxPyEndBlockThreads(blocked); \ wxPyEndBlockThreads(blocked); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,c); \ PCLASS::CBNAME(a,c); \
} }
@@ -3070,10 +3070,10 @@ wxPyMake_TEMPLATE(wxGridTableBase)
bool CBNAME() { \ bool CBNAME() { \
bool rval = 0; \ bool rval = 0; \
bool found; \ bool found; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
rval = PCLASS::CBNAME(); \ rval = PCLASS::CBNAME(); \
return rval; \ return rval; \
@@ -3084,10 +3084,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b); \ PCLASS::CBNAME(a,b); \
} }
@@ -3098,10 +3098,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }
@@ -3112,10 +3112,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }
@@ -3125,10 +3125,10 @@ 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; \
wxPyBlock_t 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); \
if (! found) \ if (! found) \
PCLASS::CBNAME(a,b,c); \ PCLASS::CBNAME(a,b,c); \
} }