predeclare eListbox because it is used by iListboxContent

[enigma2.git] / lib / gui / elistbox.cpp

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index 21394de5ac4f827d26efe9ffa6f069aad9630cc0..a5d18e6b8c461e85c05496cc23a604657a7575a9 100644 (file)
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -4,17 +4,14 @@
 #include <lib/actions/action.h>
 
 eListbox::eListbox(eWidget *parent)
-       :eWidget(parent), m_prev_scrollbar_page(-1), m_content_changed(false)
-       , m_scrollbar_mode(showNever), m_scrollbar(NULL)
+       :eWidget(parent), m_scrollbar_mode(showNever), m_prev_scrollbar_page(-1)
+       ,m_content_changed(false), m_top(0), m_selected(0), m_itemheight(25)
+       ,m_items_per_page(0), m_selection_enabled(1), m_scrollbar(NULL)
 {
        setContent(new eListboxStringContent());
 
        ePtr<eActionMap> ptr;
        eActionMap::getInstance(ptr);
-       
-       m_itemheight = 25;
-       m_selection_enabled = 1;
-       
        ptr->bindAction("ListboxActions", 0, 0, this);
 }
 
@@ -159,9 +156,19 @@ void eListbox::moveSelection(int dir)
 
 void eListbox::moveSelectionTo(int index)
 {
-       m_content->cursorHome();
-       m_content->cursorMove(index);
-       moveSelection(justCheck);
+       if ( m_content )
+       {
+               m_content->cursorHome();
+               m_content->cursorMove(index);
+               moveSelection(justCheck);
+       }
+}
+
+int eListbox::getCurrentIndex()
+{
+       if ( m_content && m_content->cursorValid() )
+               return m_content->cursorGet();
+       return 0;
 }
 
 void eListbox::updateScrollBar()
@@ -271,6 +278,10 @@ void eListbox::recalcSize()
        m_prev_scrollbar_page=-1;
        m_content->setSize(eSize(size().width(), m_itemheight));
        m_items_per_page = size().height() / m_itemheight;
+
+       if (m_items_per_page < 0) /* TODO: whyever - our size could be invalid, or itemheigh could be wrongly specified. */
+               m_items_per_page = 0;
+
        moveSelection(justCheck);
 }