- default fonts handled in windowstyle

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

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index f0912334597bf3da8236291e2fb508f35f8422f3..e549787cffc7ca253694733def027145a88d425c 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -2,7 +2,7 @@
 #define __gpixmap_h
 
 #include <pthread.h>
-#include <lib/base/estring.h>
+#include <string>
 #include <lib/base/object.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
@@ -81,40 +81,6 @@ struct gLookup
        void build(int size, const gPalette &pal, const gRGB &start, const gRGB &end);
 };
 
-/**
- * \brief A softreference to a font.
- *
- * The font is specified by a name and a size.
- * \c gFont is part of the \ref gdi.
- */
-class gFont: public iObject
-{
-DECLARE_REF;
-public:
-
-       eString family;
-       int pointSize;
-       
-       /**
-        * \brief Constructs a font with the given name and size.
-        * \param family The name of the font, for example "NimbusSansL-Regular Sans L Regular".
-        * \param pointSize the size of the font in PIXELS.
-        */
-       gFont(const eString &family, int pointSize):
-                       family(family), pointSize(pointSize)
-       {
-       }
-       
-       virtual ~gFont()
-       {
-       }
-       
-       gFont()
-               :pointSize(0)
-       {
-       }
-};
-
 struct gSurface
 {
        int type;
@@ -133,7 +99,7 @@ struct gSurfaceSystem: gSurface
 
 struct gPixmap: public iObject
 {
-DECLARE_REF;
+DECLARE_REF(gPixmap);
 private:
        friend class gDC;
        void fill(const gRegion &clip, const gColor &color);