X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/df8830e6f19c5557fd52b1a9ac4fbf23c1afcdf2..7d27b9f23f076a18a59ac6269c9db36345f8aa03:/lib/gui/elistboxcontent.h

diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index f7e5d2b6..9c89c658 100644
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -11,7 +11,7 @@ public:
 	eListboxPythonStringContent();
 	~eListboxPythonStringContent();
 
-	void setList(PyObject *list);
+	void setList(SWIG_PYOBJECT(ePyObject) list);
 	PyObject *getCurrentSelection();
 	int getCurrentSelectionIndex() { return m_cursor; }
 	void invalidateEntry(int index);
@@ -40,7 +40,7 @@ protected:
 	virtual void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
 
 protected:
-	PyObject *m_list;
+	ePyObject m_list;
 	int m_cursor, m_saved_cursor;
 	eSize m_itemsize;
 #endif
@@ -58,7 +58,7 @@ private:
 
 class eListboxPythonMultiContent: public eListboxPythonStringContent
 {
-	PyObject *m_buildFunc;
+	ePyObject m_buildFunc;
 public:
 	eListboxPythonMultiContent();
 	~eListboxPythonMultiContent();
@@ -67,9 +67,20 @@ public:
 	int currentCursorSelectable();
 	
 	void setFont(int fnt, gFont *fnt);
-	void setBuildFunc(PyObject *func);
+	void setBuildFunc(SWIG_PYOBJECT(ePyObject) func);
 private:
 	std::map<int, ePtr<gFont> > m_font;
 };
 
+#ifdef SWIG
+#define RT_HALIGN_LEFT 0
+#define RT_HALIGN_RIGHT 1
+#define RT_HALIGN_CENTER 2
+#define RT_HALIGN_BLOCK 4
+#define RT_VALIGN_TOP 0
+#define RT_VALIGN_CENTER 8
+#define RT_VALIGN_BOTTOM 16
+#define RT_WRAP 32
+#endif // SWIG
+
 #endif