Merge branch 'master' of /home/tmbinc/enigma2-git

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

diff --git a/lib/gui/epixmap.h b/lib/gui/epixmap.h
index 04196befca002f7aa2ec9c875025d6aa2139c57f..1c4a97c8571add03188a32032349d6c37c821515 100644 (file)
--- a/lib/gui/epixmap.h
+++ b/lib/gui/epixmap.h
@@ -1,21 +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
 {
 #define __lib_gui_epixmap_h
 
 #include <lib/gui/ewidget.h>
 
 class ePixmap: public eWidget
 {

-       bool m_alphatest;
+       int m_alphatest;

 public:
        ePixmap(eWidget *parent);
 public:
        ePixmap(eWidget *parent);

-       
+

        void setPixmap(gPixmap *pixmap);
        void setPixmap(ePtr<gPixmap> &pixmap);
        void setPixmapFromFile(const char *filename);
        void setPixmap(gPixmap *pixmap);
        void setPixmap(ePtr<gPixmap> &pixmap);
        void setPixmapFromFile(const char *filename);

-       void setAlphatest(bool alphatest);
+       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);
 protected:
        ePtr<gPixmap> m_pixmap;
        int event(int event, void *data=0, void *data2=0);

+       void checkSize();

 private:
        enum eLabelEvent
        {
 private:
        enum eLabelEvent
        {