X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54b9e2790954b623c99823ab64782d4e39c128bf..aa4989974a32ab2437d51fb6352b3eb54cecd83d:/lib/gdi/gpixmap.h

diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index 8ea12574..732ebf9a 100644
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -4,9 +4,11 @@
 #include <pthread.h>
 #include <string>
 #include <lib/base/object.h>
+#include <lib/base/smartptr.h>
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/fb.h>
+#include <lib/gdi/region.h>
 
 struct gColor
 {
@@ -98,16 +100,7 @@ struct gSurface
 
 class gPixmap: public iObject
 {
-private:
-DECLARE_REF(gPixmap);
-private:
-	friend class gDC;
-	void fill(const gRegion &clip, const gColor &color);
-	
-	void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
-	
-	void mergePalette(const gPixmap &target);
-	void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
+	DECLARE_REF(gPixmap);
 public:
 	enum
 	{
@@ -115,6 +108,10 @@ public:
 		blitAlphaBlend=2
 	};
 
+#ifndef SWIG
+	gPixmap(gSurface *surface);
+	gPixmap(eSize, int bpp, int accel = 0);
+
 	gSurface *surface;
 	
 	eLock contentlock;
@@ -122,12 +119,24 @@ public:
 	
 	gPixmap *lock();
 	void unlock();
+#endif
+	virtual ~gPixmap();
 	
 	eSize size() const { return eSize(surface->x, surface->y); }
 	
-	gPixmap(gSurface *surface);
-	gPixmap(eSize, int bpp, int accel = 0);
-	virtual ~gPixmap();
+private:
+#ifndef SWIG
+	friend class gDC;
+	void fill(const gRegion &clip, const gColor &color);
+	
+	void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
+	
+	void mergePalette(const gPixmap &target);
+	void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
+#else
+	gPixmap();
+#endif
+
 };
 
 TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);