Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / gui / epixmap.h

diff --git a/lib/gui/epixmap.h b/lib/gui/epixmap.h
index 8a12e2e9037416c0b1c887f0ff3af313a3ad215c..1c4a97c8571add03188a32032349d6c37c821515 100644 (file)
--- a/lib/gui/epixmap.h
+++ b/lib/gui/epixmap.h
@@ -1,17 +1,22 @@
-#ifndef __lib_gui_epximap_h
+#ifndef __lib_gui_epixmap_h
 #define __lib_gui_epixmap_h
 
 #include <lib/gui/ewidget.h>
 
 class ePixmap: public eWidget
 {
+       int m_alphatest;
 public:
        ePixmap(eWidget *parent);
-       
+
        void setPixmap(gPixmap *pixmap);
+       void setPixmap(ePtr<gPixmap> &pixmap);
+       void setPixmapFromFile(const char *filename);
+       void setAlphatest(int alphatest); /* 1 for alphatest, 2 for alphablend */
 protected:
        ePtr<gPixmap> m_pixmap;
        int event(int event, void *data=0, void *data2=0);
+       void checkSize();
 private:
        enum eLabelEvent
        {