Merge remote branch 'remotes/origin/bug_587_new_internally_connectable_and_unsupporte...

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

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index d717ec6ff5d39c01d1c22b14f0a24c2673d942a5..87fb5029906511780c5a31436c580b4500f6972e 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -107,17 +107,19 @@ struct gSurface
 
 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);
 
@@ -128,28 +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); }
-       inline bool needClut() const { return surface && surface->bpp <= 8; }
 private:
        bool must_delete_surface;
-#ifndef SWIG
        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