use newer eDVBServicePMTHandler::tuneExt call, add a virtual createDataSource functio...

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

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index 91f2f0b7414b143d35d00d3ce362bb60dc8afb9a..5008cd6e1d73a6f76f759b8dff391318e23cafad 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -7,22 +7,13 @@ class gFont;
 
 #include <lib/base/object.h>
 
 
 #include <lib/base/object.h>
 

-SWIG_IGNORE(eWindowStyle);
-class eWindowStyle: public iObject
+class eWindowStyle_ENUMS

 {
 #ifdef SWIG
 {
 #ifdef SWIG

-       eWindowStyle();
+       eWindowStyle_ENUMS();
+       ~eWindowStyle_ENUMS();

 #endif
 public:
 #endif
 public:

-#ifndef SWIG
-       virtual void handleNewSize(eWindow *wnd, eSize &size, eSize &offset) = 0;
-       virtual void paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title) = 0;
-       virtual void paintBackground(gPainter &painter, const ePoint &offset, const eSize &size) = 0;
-       virtual void setStyle(gPainter &painter, int what) = 0;
-       virtual void drawFrame(gPainter &painter, const eRect &frame, int type) = 0;
-       virtual RESULT getFont(int what, ePtr<gFont> &font) = 0;
-#endif
-       virtual ~eWindowStyle() = 0;

        enum {
                styleLabel,
                styleListboxSelected,
        enum {
                styleLabel,
                styleListboxSelected,


@@ -30,18 +21,36 @@ public:
                styleListboxMarked,
                styleListboxMarkedAndSelected
        };
                styleListboxMarked,
                styleListboxMarkedAndSelected
        };

-       
+

        enum {
                frameButton,
                frameListboxEntry
        };
        enum {
                frameButton,
                frameListboxEntry
        };

-       
+

        enum {
                fontStatic,
                fontButton,
                fontTitlebar
        };
 };
        enum {
                fontStatic,
                fontButton,
                fontTitlebar
        };
 };

+
+SWIG_IGNORE(eWindowStyle);
+class eWindowStyle: public eWindowStyle_ENUMS, public iObject
+{
+#ifdef SWIG
+       eWindowStyle();
+#endif
+public:
+#ifndef SWIG
+       virtual void handleNewSize(eWindow *wnd, eSize &size, eSize &offset) = 0;
+       virtual void paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title) = 0;
+       virtual void paintBackground(gPainter &painter, const ePoint &offset, const eSize &size) = 0;
+       virtual void setStyle(gPainter &painter, int what) = 0;
+       virtual void drawFrame(gPainter &painter, const eRect &frame, int type) = 0;
+       virtual RESULT getFont(int what, ePtr<gFont> &font) = 0;
+#endif
+       virtual ~eWindowStyle() = 0;
+};

 SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyle>, eWindowStylePtr);
 
 SWIG_IGNORE(eWindowStyleManager);
 SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyle>, eWindowStylePtr);
 
 SWIG_IGNORE(eWindowStyleManager);


@@ -56,15 +65,15 @@ public:
 #ifndef SWIG
        eWindowStyleManager();
        ~eWindowStyleManager();
 #ifndef SWIG
        eWindowStyleManager();
        ~eWindowStyleManager();

+       static SWIG_VOID(int) getInstance(ePtr<eWindowStyleManager> &SWIG_NAMED_OUTPUT(mgr)) { mgr = m_instance; if (!mgr) return -1; return 0; }

 #endif
        void getStyle(int style_id, ePtr<eWindowStyle> &SWIG_OUTPUT);
        void setStyle(int style_id, eWindowStyle *style);
 #endif
        void getStyle(int style_id, ePtr<eWindowStyle> &SWIG_OUTPUT);
        void setStyle(int style_id, eWindowStyle *style);

-       static SWIG_VOID(int) getInstance(ePtr<eWindowStyleManager> &SWIG_NAMED_OUTPUT(mgr)) { mgr = m_instance; if (!mgr) return -1; return 0; }

 private:
        static eWindowStyleManager *m_instance;
        std::map<int, ePtr<eWindowStyle> > m_current_style;
 };
 private:
        static eWindowStyleManager *m_instance;
        std::map<int, ePtr<eWindowStyle> > m_current_style;
 };

-SWIG_TEMPLATE_TYPEDEF_REPLACE(ePtr<eWindowStyleManager>, eWindowStyleManager);
+SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManager);

 SWIG_EXTEND(ePtr<eWindowStyleManager>,
        static ePtr<eWindowStyleManager> getInstance()
        {
 SWIG_EXTEND(ePtr<eWindowStyleManager>,
        static ePtr<eWindowStyleManager> getInstance()
        {


@@ -77,7 +86,6 @@ SWIG_EXTEND(ePtr<eWindowStyleManager>,
 class eWindowStyleSimple: public eWindowStyle
 {
        DECLARE_REF(eWindowStyleSimple);
 class eWindowStyleSimple: public eWindowStyle
 {
        DECLARE_REF(eWindowStyleSimple);

-private:

        ePtr<gFont> m_fnt;
        gColor m_border_color_tl, m_border_color_br, m_title_color_back, m_title_color, m_background_color;
        
        ePtr<gFont> m_fnt;
        gColor m_border_color_tl, m_border_color_br, m_title_color_back, m_title_color, m_background_color;