WLAN: fix inversed logic for WPA2 vs. WPA/WPA2

[enigma2.git] / lib / gdi / gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index bd53716441d2f6d49b60510a6b61ed6d5458ad0b..87fb5029906511780c5a31436c580b4500f6972e 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -9,19 +9,6 @@
 #include <lib/gdi/erect.h>
 #include <lib/gdi/fb.h>
 
-struct gColor
-{
-       int color;
-       gColor(int color): color(color)
-       {
-       }
-       gColor(): color(0)
-       {
-       }
-       operator int() const { return color; }
-       bool operator==(const gColor &o) const { return o.color==color; }
-};
-
 struct gRGB
 {
        unsigned char b, g, r, a;
@@ -34,6 +21,12 @@ struct gRGB
        gRGB(): b(0), g(0), r(0), a(0)
        {
        }
+
+       unsigned long argb() const
+       {
+               return (a<<24)|(r<<16)|(g<<8)|b;
+       }
+
        void operator=(unsigned long val)
        {
                b = val&0xFF;
@@ -65,6 +58,20 @@ struct gRGB
        }
 };
 
+#ifndef SWIG
+struct gColor
+{
+       int color;
+       gColor(int color): color(color)
+       {
+       }
+       gColor(): color(0)
+       {
+       }
+       operator int() const { return color; }
+       bool operator==(const gColor &o) const { return o.color==color; }
+};
+
 struct gPalette
 {
        int start, colors;
@@ -96,18 +103,23 @@ struct gSurface
        gSurface(eSize size, int bpp, int accel);
        ~gSurface();
 };
+#endif
+
+class gRegion;
 
+SWIG_IGNORE(gPixmap);
 class gPixmap: public iObject
 {
        DECLARE_REF(gPixmap);
 public:
+#ifndef SWIG
        enum
        {
                blitAlphaTest=1,
-               blitAlphaBlend=2
+               blitAlphaBlend=2,
+               blitScale=4
        };
 
-#ifndef SWIG
        gPixmap(gSurface *surface);
        gPixmap(eSize, int bpp, int accel = 0);
 
@@ -118,26 +130,24 @@ public:
        
        gPixmap *lock();
        void unlock();
+       inline bool needClut() const { return surface && surface->bpp <= 8; }
 #endif
        virtual ~gPixmap();
-       
        eSize size() const { return eSize(surface->x, surface->y); }
-       
 private:
-#ifndef SWIG
+       bool must_delete_surface;
        friend class gDC;
        void fill(const gRegion &clip, const gColor &color);
+       void fill(const gRegion &clip, const gRGB &color);
        
-       void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
+       void blit(const gPixmap &src, const eRect &pos, const gRegion &clip, int flags=0);
        
        void mergePalette(const gPixmap &target);
        void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
-#else
+#ifdef SWIG
        gPixmap();
 #endif
-
 };
-
-TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
 
 #endif