Merge branch 'master' of /home/tmbinc/enigma2-git

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

diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index f1eb4bf7a3d46c406a229fe3bf39724b238f5766..bf183f990ebbbf0dfc37424a716ba9778aa85944 100644 (file)
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -523,7 +523,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
                        if (pbackColor)
                        {
-                               int color = PyInt_AsLong(pbackColor);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColor);
                                painter.setBackgroundColor(gRGB(color));
                        } // transparent background?
                        // if we have a local background color set, use that. 
@@ -543,7 +543,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxSelected);
                        if (pbackColorSelected)
                        {
-                               int color = PyInt_AsLong(pbackColorSelected);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected);
                                painter.setBackgroundColor(gRGB(color));
                        }
                        else if (local_style && local_style->m_background_color_selected_set)
@@ -560,7 +560,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxSelected);
                        if (pbackColorSelected)
                        {
-                               int color = PyInt_AsLong(pbackColorSelected);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColorSelected);
                                painter.setBackgroundColor(gRGB(color));
                        }
                        else if (local_style && local_style->m_background_color_selected_set)
@@ -572,7 +572,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
                        style.setStyle(painter, eWindowStyle::styleListboxNormal);
                        if (pbackColor)
                        {
-                               int color = PyInt_AsLong(pbackColor);
+                               unsigned int color = PyInt_AsUnsignedLongMask(pbackColor);
                                painter.setBackgroundColor(gRGB(color));
                        }/* if we have a local background color set, use that. */
                        else if (local_style && local_style->m_background_color_set)
@@ -588,7 +588,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
        {
                if (pforeColorSelected)
                {
-                       int color = PyInt_AsLong(pforeColorSelected);
+                       unsigned int color = PyInt_AsUnsignedLongMask(pforeColorSelected);
                        painter.setForegroundColor(gRGB(color));
                }
                /* if we have a local foreground color set, use that. */
@@ -599,7 +599,7 @@ static void clearRegion(gPainter &painter, eWindowStyle &style, eListboxStyle *l
        {
                if (pforeColor)
                {
-                       int color = PyInt_AsLong(pforeColor);
+                       unsigned int color = PyInt_AsUnsignedLongMask(pforeColor);
                        painter.setForegroundColor(gRGB(color));
                }
                /* if we have a local foreground color set, use that. */
@@ -616,7 +616,7 @@ static ePyObject lookupColor(ePyObject color, ePyObject data)
        if ((!color) && (!data))
                return color;
 
-       unsigned int icolor = PyInt_AsLong(color);
+       unsigned int icolor = PyInt_AsUnsignedLongMask(color);
 
                /* check if we have the "magic" template color */
        if ((icolor & 0xFF000000) == 0xFF000000)
@@ -779,6 +779,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                if (PyInt_Check(pstring) && data) /* if the string is in fact a number, it refers to the 'data' list. */
                                        pstring = PyTuple_GetItem(data, PyInt_AsLong(pstring));
 
+                                                       /* don't do anything if we have 'None' as string */
+                               if (pstring == Py_None)
+                                       continue;
+
                                const char *string = (PyString_Check(pstring)) ? PyString_AsString(pstring) : "<not-a-string>";
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
@@ -813,7 +817,7 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                        painter.clip(rect);
                                        if (pborderColor)
                                        {
-                                               int color = PyInt_AsLong(pborderColor);
+                                               unsigned int color = PyInt_AsUnsignedLongMask(pborderColor);
                                                painter.setForegroundColor(gRGB(color));
                                        }
 
@@ -945,6 +949,10 @@ void eListboxPythonMultiContent::paint(gPainter &painter, eWindowStyle &style, c
                                if (PyInt_Check(ppixmap) && data) /* if the pixemap is in fact a number, it refers to the 'data' list. */
                                        ppixmap = PyTuple_GetItem(data, PyInt_AsLong(ppixmap));
 
+                                                       /* don't do anything if we have 'None' as pixmap */
+                               if (ppixmap == Py_None)
+                                       continue;
+
                                int x = PyInt_AsLong(px) + offset.x();
                                int y = PyInt_AsLong(py) + offset.y();
                                int width = PyInt_AsLong(pwidth);