rotor turning with measure input power is now working

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

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 9dd170ac49be822a6936b07dbd895bb68720277c..d598fdbd3786a9f78661f5a6917cad88d6ffec66 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.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:
-
-       std::string 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 std::string &family, int pointSize):
-                       family(family), pointSize(pointSize)
-       {
-       }
-       
-       virtual ~gFont()
-       {
-       }
-       
-       gFont()
-               :pointSize(0)
-       {
-       }
-};
-
 struct gSurface
 {
        int type;
@@ -131,9 +97,10 @@ struct gSurfaceSystem: gSurface
        ~gSurfaceSystem();
 };
 
-struct gPixmap: public iObject
+class gPixmap: public iObject
 {
-DECLARE_REF;
+private:
+DECLARE_REF(gPixmap);
 private:
        friend class gDC;
        void fill(const gRegion &clip, const gColor &color);
@@ -155,11 +122,13 @@ public:
        gPixmap *lock();
        void unlock();
        
-       eSize getSize() const { return eSize(surface->x, surface->y); }
+       eSize size() const { return eSize(surface->x, surface->y); }
        
        gPixmap(gSurface *surface);
        gPixmap(eSize, int bpp);
        virtual ~gPixmap();
 };
 
+TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+
 #endif