remove lib/content

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 479317924d53f8887b9abb411cac1df165039d73..d6a3cd70dea21fe3f9279235006f1c80f6cc1ebc 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -11,7 +11,7 @@
 #include <stack>
 #include <list>
 
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/ringbuffer.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
@@ -29,7 +29,7 @@ struct gOpcode
                renderPara,
                setFont,
                
-               fill, clear,
+               fill, fillRegion, clear,
                blit,
 
                setPalette,
@@ -55,10 +55,15 @@ struct gOpcode
                        eRect area;
                } *fill;
 
+               struct pfillRegion
+               {
+                       gRegion region;
+               } *fillRegion;
+
                struct prenderText
                {
                        eRect area;
-                       eString text;
+                       std::string text;
                        int flags;
                } *renderText;
 
@@ -117,7 +122,7 @@ struct gOpcode
 };
 
                /* gRC is the singleton which controls the fifo and dispatches commands */
-class gRC: public virtual iObject
+class gRC: public iObject
 {
 DECLARE_REF;
 private:
@@ -173,6 +178,7 @@ public:
        void renderPara(eTextPara *para, ePoint offset=ePoint(0, 0));
 
        void fill(const eRect &area);
+       void fill(const gRegion &area);
        
        void clear();