use new/delete instead of malloc/free

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

diff --git a/lib/gdi/grc.h b/lib/gdi/grc.h
index 3231aab3a974e3020d7bee61aaddd0bb5eddc69b..f931046a88016f1a79d96aaea1dcc953645aa1a1 100644 (file)
--- a/lib/gdi/grc.h
+++ b/lib/gdi/grc.h
@@ -7,6 +7,10 @@
        gPixmap aufsetzt (und damit unbeschleunigt ist).
 */
 
+// for debugging use:
+//#define SYNC_PAINT
+#undef SYNC_PAINT
+
 #include <pthread.h>
 #include <stack>
 #include <list>
@@ -73,7 +77,7 @@ struct gOpcode
                struct prenderText
                {
                        eRect area;
-                       std::string text;
+                       char *text;
                        int flags;
                } *renderText;
 
@@ -181,7 +185,7 @@ class gPainter
 public:
        gPainter(gDC *dc, eRect rect=eRect());
        virtual ~gPainter();
-
+       
        void setBackgroundColor(const gColor &color);
        void setForegroundColor(const gColor &color);
 
@@ -248,6 +252,7 @@ protected:
        ePtr<gPixmap> m_pixmap;
 
        gColor m_foreground_color, m_background_color;
+       gRGB m_foreground_color_rgb, m_background_color_rgb;
        ePtr<gFont> m_current_font;
        ePoint m_current_offset;
        
@@ -263,6 +268,7 @@ public:
        int getPixmap(ePtr<gPixmap> &pm) { pm = m_pixmap; return 0; }
        gRGB getRGB(gColor col);
        virtual eSize size() { return m_pixmap->size(); }
+       virtual int islocked() { return 0; }
 };
 
 #endif