X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/54c5d207bf165cda83eec602c57ed36d1f278454..1446dc7551cab6dfac53dda7eb8a8c3b3182cf48:/lib/gdi/gpixmap.h diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h index d717ec6f..e3798bf7 100644 --- a/lib/gdi/gpixmap.h +++ b/lib/gdi/gpixmap.h @@ -107,17 +107,18 @@ struct gSurface class gRegion; +SWIG_IGNORE(gPixmap); class gPixmap: public iObject { DECLARE_REF(gPixmap); public: +#ifndef SWIG enum { blitAlphaTest=1, blitAlphaBlend=2 }; -#ifndef SWIG gPixmap(gSurface *surface); gPixmap(eSize, int bpp, int accel = 0); @@ -128,14 +129,12 @@ public: gPixmap *lock(); void unlock(); + inline bool needClut() const { return surface && surface->bpp <= 8; } #endif virtual ~gPixmap(); - eSize size() const { return eSize(surface->x, surface->y); } - inline bool needClut() const { return surface && surface->bpp <= 8; } private: bool must_delete_surface; -#ifndef SWIG friend class gDC; void fill(const gRegion &clip, const gColor &color); void fill(const gRegion &clip, const gRGB &color); @@ -144,12 +143,10 @@ private: void mergePalette(const gPixmap &target); void line(const gRegion &clip, ePoint start, ePoint end, gColor color); -#else +#ifdef SWIG gPixmap(); #endif - }; - -TEMPLATE_TYPEDEF(ePtr, gPixmapPtr); +SWIG_TEMPLATE_TYPEDEF(ePtr, gPixmapPtr); #endif