Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer' into experimental

[vuplus_dvbapp] / lib / gui / elistboxcontent.h

diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index 6469901..2649c09 100644 (file)
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -69,11 +69,11 @@ class eListboxPythonMultiContent: public eListboxPythonStringContent
 public:
        eListboxPythonMultiContent();
        ~eListboxPythonMultiContent();
-       enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST };
+       enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST, TYPE_PIXMAP_ALPHABLEND, TYPE_PROGRESS_PIXMAP };
        void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
        int currentCursorSelectable();
        void setList(SWIG_PYOBJECT(ePyObject) list);
-       void setFont(int fnt, gFont *fnt);
+       void setFont(int fnt, gFont *font);
        void setBuildFunc(SWIG_PYOBJECT(ePyObject) func);
        void setSelectableFunc(SWIG_PYOBJECT(ePyObject) func);
        void setItemHeight(int height);