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

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 57d3dce4098e71006eca2ad5e67dbd2e7edbbb14..7071425ef6ce7e968b96e239c35b4db5cc365e1f 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -23,7 +23,6 @@
 #include <lib/gdi/region.h>
 #include <lib/gdi/gfont.h>
 
-#ifndef SWIG
 class eTextPara;
 
 class gDC;
@@ -146,8 +145,7 @@ struct gOpcode
                /* gRC is the singleton which controls the fifo and dispatches commands */
 class gRC: public iObject, public Object
 {
-DECLARE_REF(gRC);
-private:
+       DECLARE_REF(gRC);
        friend class gPainter;
        static gRC *instance;
 
@@ -231,7 +229,8 @@ public:
 
        enum
        {
-               BT_ALPHATEST = 1
+               BT_ALPHATEST = 1,
+               BT_ALPHABLEND = 2
        };
 
        void blit(gPixmap *pixmap, ePoint pos, const eRect &what=eRect(), int flags=0);
@@ -250,18 +249,14 @@ public:
        void clip(const gRegion &clip);
        void clippop();
 
-       void flush();
-       
        void waitVSync();
        void flip();
        void notify();
 };
-#endif
 
 class gDC: public iObject
 {
-DECLARE_REF(gDC);
-#ifndef SWIG
+       DECLARE_REF(gDC);
 protected:
        ePtr<gPixmap> m_pixmap;
 
@@ -279,9 +274,6 @@ protected:
        int m_spinner_num, m_spinner_i;
 public:
        virtual void exec(gOpcode *opcode);
-#else
-public:
-#endif
        gDC(gPixmap *pixmap);
        gDC();
        virtual ~gDC();