fixed bug in IMP_PYCALLBACK__BOOL2DBL2INT, for #223404 in the tracker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8a721b35f6
commit
f2e1c18a79
@ -137,13 +137,6 @@ extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type);
|
|||||||
# pragma warning(disable:4190)
|
# pragma warning(disable:4190)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Non-const versions to keep SWIG happy.
|
|
||||||
// extern wxPoint wxPyDefaultPosition;
|
|
||||||
// extern wxSize wxPyDefaultSize;
|
|
||||||
// extern wxString wxPyEmptyStr;
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
class wxPyCallback : public wxObject {
|
class wxPyCallback : public wxObject {
|
||||||
@ -620,8 +613,8 @@ public:
|
|||||||
#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 doSave = wxPyRestoreThread(); \
|
bool doSave = wxPyRestoreThread(); \
|
||||||
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
if (wxPyCBH_findCallback(m_myInst, #CBNAME)) \
|
||||||
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(idii)", \
|
wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)", \
|
||||||
(int)a,b,c,d,e)); \
|
(int)a,b,c,d,e)); \
|
||||||
else \
|
else \
|
||||||
PCLASS::CBNAME(a, b, c, d, e); \
|
PCLASS::CBNAME(a, b, c, d, e); \
|
||||||
|
Loading…
Reference in New Issue
Block a user