remove test cruft, add possibility for a seperator

[enigma2.git] / lib / gui / elistboxcontent.h

diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index d3648373b0a7a520a910a414a6e4a569ef695a01..acf6525b92824d571ac24bf7f9da4c14dc2f4423 100644 (file)
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -4,75 +4,6 @@
 #include <lib/python/python.h>
 #include <lib/gui/elistbox.h>
 
-class eListboxTestContent: public virtual iListboxContent
-{
-       DECLARE_REF(eListboxTestContent);
-public:
-
-#ifndef SWIG
-protected:
-       void cursorHome();
-       void cursorEnd();
-       int cursorMove(int count=1);
-       int cursorValid();
-       int cursorSet(int n);
-       int cursorGet();
-       
-       void cursorSave();
-       void cursorRestore();
-       int size();
-       
-       RESULT connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection);
-       
-       // void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
-       void setSize(const eSize &size);
-       
-               /* the following functions always refer to the selected item */
-       void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
-private:
-       int m_cursor, m_saved_cursor;
-       eSize m_size;
-#endif
-};
-
-class eListboxStringContent: public virtual iListboxContent
-{
-       DECLARE_REF(eListboxStringContent);
-public:
-       eListboxStringContent();
-       void setList(std::list<std::string> &list);
-#ifndef SWI
-protected:
-       
-       void cursorHome();
-       void cursorEnd();
-       int cursorMove(int count=1);
-       int cursorValid();
-       int cursorSet(int n);
-       int cursorGet();
-       
-       void cursorSave();
-       void cursorRestore();
-       int size();
-       
-       // void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
-       void setSize(const eSize &size);
-       
-               /* the following functions always refer to the selected item */
-       void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
-private:
-       typedef std::list<std::string> list;
-       
-       list m_list;
-       list::iterator m_cursor, m_saved_cursor;
-       
-       int m_cursor_number, m_saved_cursor_number;
-       int m_size;
-       
-       eSize m_itemsize;
-#endif
-};
-
 class eListboxPythonStringContent: public virtual iListboxContent
 {
        DECLARE_REF(eListboxPythonStringContent);
@@ -94,7 +25,8 @@ protected:
        int cursorValid();
        int cursorSet(int n);
        int cursorGet();
-       
+       virtual int currentCursorSelectable();
+               
        void cursorSave();
        void cursorRestore();
        int size();
@@ -119,6 +51,7 @@ class eListboxPythonConfigContent: public eListboxPythonStringContent
 public:
        void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
        void setSeperation(int sep) { m_seperation = sep; }
+       int currentCursorSelectable();
 private:
        int m_seperation;
 };
@@ -128,6 +61,7 @@ class eListboxPythonMultiContent: public eListboxPythonStringContent
 public:
        enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST };
        void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
+       int currentCursorSelectable();
        
        void setFont(int fnt, gFont *fnt);
 private: