- minor bugfix (allow empty content)

 - allow tuples as list elements
 - fake main menu

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index e06ab3e6..5a9ee4d6 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -10,7 +10,8 @@ void eListbox::setContent(iListboxContent *content)
 {
 	m_content = content;
 	invalidate();
-	m_content->cursorHome();
+	if (m_content)
+		m_content->cursorHome();
 	m_top = 0;
 	m_selected = 0;
 }
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index 2f05f5dc..d3a2e77a 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -337,6 +337,10 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 	{
 		PyObject *item = PyList_GetItem(m_list, m_cursor); // borrowed reference!
 		painter.setFont(fnt);
+
+			/* the user can supply tuples, in this case the first one will be displayed. */		
+		if (PyTuple_Check(item))
+			item = PyTuple_GetItem(item, 0);
 		
 		const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";