From 866bf4c43f79a42337ac654dfa35df7b95c8e2d5 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 31 Jul 2007 10:09:49 +0000 Subject: renable callable func to selectable func --- lib/gui/elistboxcontent.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/gui/elistboxcontent.cpp') diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp index fbbbb6ff..24a29512 100644 --- a/lib/gui/elistboxcontent.cpp +++ b/lib/gui/elistboxcontent.cpp @@ -392,7 +392,7 @@ eListboxPythonMultiContent::eListboxPythonMultiContent() eListboxPythonMultiContent::~eListboxPythonMultiContent() { Py_XDECREF(m_buildFunc); - Py_XDECREF(m_callableFunc); + Py_XDECREF(m_selectableFunc); } void eListboxPythonMultiContent::setSelectionClip(eRect &rect, bool update) @@ -803,11 +803,11 @@ void eListboxPythonMultiContent::setBuildFunc(ePyObject cb) Py_XINCREF(m_buildFunc); } -void eListboxPythonMultiContent::setCallableFunc(ePyObject cb) +void eListboxPythonMultiContent::setSelectableFunc(ePyObject cb) { - Py_XDECREF(m_callableFunc); - m_callableFunc=cb; - Py_XINCREF(m_callableFunc); + Py_XDECREF(m_selectableFunc); + m_selectableFunc=cb; + Py_XINCREF(m_selectableFunc); } int eListboxPythonMultiContent::currentCursorSelectable() @@ -815,15 +815,15 @@ int eListboxPythonMultiContent::currentCursorSelectable() /* each list-entry is a list of tuples. if the first of these is none, it's not selectable */ if (m_list && cursorValid()) { - if (m_callableFunc && PyCallable_Check(m_callableFunc)) + if (m_selectableFunc && PyCallable_Check(m_selectableFunc)) { ePyObject args = PyList_GET_ITEM(m_list, m_cursor); // borrowed reference! if (PyTuple_Check(args)) { - ePyObject ret = PyObject_CallObject(m_callableFunc, args); + ePyObject ret = PyObject_CallObject(m_selectableFunc, args); if (ret) return ret == Py_True; - eDebug("call m_callableFunc failed!!! assume not callable"); + eDebug("call m_selectableFunc failed!!! assume not callable"); } else eDebug("m_list[m_cursor] is not a tuple!!! assume not callable"); -- cgit v1.2.3