Add supoprt for wxListCtrl::OnGetItemColumnImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2181,6 +2181,60 @@ extern wxPyApp *wxPythonApp;
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#define DEC_PYCALLBACK_INT_LONGLONG(CBNAME) \
|
||||
int CBNAME(long a, long b) const; \
|
||||
int base_##CBNAME(long a, long b) const
|
||||
|
||||
|
||||
#define IMP_PYCALLBACK_INT_LONGLONG(CLASS, PCLASS, CBNAME) \
|
||||
int CLASS::CBNAME(long a, long b) const { \
|
||||
int rval=-1; \
|
||||
bool found; \
|
||||
wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \
|
||||
if (ro) { \
|
||||
rval = PyInt_AsLong(ro); \
|
||||
Py_DECREF(ro); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(blocked); \
|
||||
if (! found) \
|
||||
rval = PCLASS::CBNAME(a, b); \
|
||||
return rval; \
|
||||
} \
|
||||
int CLASS::base_##CBNAME(long a, long b) const { \
|
||||
return PCLASS::CBNAME(a, b); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#define DEC_PYCALLBACK_INT_LONGLONG_virtual(CBNAME) \
|
||||
int CBNAME(long a, long b) const;
|
||||
|
||||
|
||||
#define IMP_PYCALLBACK_INT_LONGLONG_virtual(CLASS, PCLASS, CBNAME) \
|
||||
int CLASS::CBNAME(long a, long b) const { \
|
||||
int rval=-1; /* this rval is important for OnGetItemImage */ \
|
||||
bool found; \
|
||||
wxPyBlock_t blocked = wxPyBeginBlockThreads(); \
|
||||
if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \
|
||||
PyObject* ro; \
|
||||
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(ll)",a,b)); \
|
||||
if (ro) { \
|
||||
rval = PyInt_AsLong(ro); \
|
||||
Py_DECREF(ro); \
|
||||
} \
|
||||
} \
|
||||
wxPyEndBlockThreads(blocked); \
|
||||
return rval; \
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#define DEC_PYCALLBACK_LISTATTR_LONG(CBNAME) \
|
||||
|
Reference in New Issue
Block a user