X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ddc3964ed95d01e72229dc9af968a327cd84e56c..62b8a649fcae500c983215fac2e5202916c0195f:/lib/gdi/gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 9dd170ac..d598fdbd 100644
--- 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