git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_305_add_plugin_where_audiomenu'
[enigma2.git]
/
lib
/
gdi
/
gpixmap.h
diff --git
a/lib/gdi/gpixmap.h
b/lib/gdi/gpixmap.h
index d717ec6ff5d39c01d1c22b14f0a24c2673d942a5..87fb5029906511780c5a31436c580b4500f6972e 100644
(file)
--- a/
lib/gdi/gpixmap.h
+++ b/
lib/gdi/gpixmap.h
@@
-107,17
+107,19
@@
struct gSurface
class gRegion;
class gRegion;
+SWIG_IGNORE(gPixmap);
class gPixmap: public iObject
{
DECLARE_REF(gPixmap);
public:
class gPixmap: public iObject
{
DECLARE_REF(gPixmap);
public:
+#ifndef SWIG
enum
{
blitAlphaTest=1,
enum
{
blitAlphaTest=1,
- blitAlphaBlend=2
+ blitAlphaBlend=2,
+ blitScale=4
};
};
-#ifndef SWIG
gPixmap(gSurface *surface);
gPixmap(eSize, int bpp, int accel = 0);
gPixmap(gSurface *surface);
gPixmap(eSize, int bpp, int accel = 0);
@@
-128,28
+130,24
@@
public:
gPixmap *lock();
void unlock();
gPixmap *lock();
void unlock();
+ inline bool needClut() const { return surface && surface->bpp <= 8; }
#endif
virtual ~gPixmap();
#endif
virtual ~gPixmap();
-
eSize size() const { return eSize(surface->x, surface->y); }
eSize size() const { return eSize(surface->x, surface->y); }
- inline bool needClut() const { return surface && surface->bpp <= 8; }
private:
bool must_delete_surface;
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);
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
void fill(const gRegion &clip, const gRGB &color);
- void blit(const gPixmap &src,
ePoint
pos, const gRegion &clip, int flags=0);
+ void blit(const gPixmap &src,
const eRect &
pos, const gRegion &clip, int flags=0);
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
-#
else
+#
ifdef SWIG
gPixmap();
#endif
gPixmap();
#endif
-
};
};
-
-TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
#endif
#endif