add some debugging to the Wizard

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

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index 04d9d44ae3c481d955de4110b98717107b4caa76..c204a0344273ad0f1c8788428fa247c4e4e72d00 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -7,37 +7,53 @@ class gFont;
 
 #include <lib/base/object.h>
 
-class eWindowStyle: public iObject
+class eWindowStyle_ENUMS
 {
+#ifdef SWIG
+       eWindowStyle_ENUMS();
+       ~eWindowStyle_ENUMS();
+#endif
 public:
-       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;
        enum {
                styleLabel,
                styleListboxSelected,
                styleListboxNormal,
-               styleListboxMarked
+               styleListboxMarked,
+               styleListboxMarkedAndSelected
        };
-       
-       virtual void drawFrame(gPainter &painter, const eRect &frame, int type) = 0;
-       
+
        enum {
                frameButton,
                frameListboxEntry
        };
-       
+
        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);
 class eWindowStyleManager: public iObject
 {
        DECLARE_REF(eWindowStyleManager);
@@ -49,17 +65,24 @@ public:
 #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(ePtr<eWindowStyle> &style);
-       void setStyle(eWindowStyle *style);
-       static int getInstance(ePtr<eWindowStyleManager> &mgr) { mgr = m_instance; if (!mgr) return -1; return 0; }
+       void getStyle(int style_id, ePtr<eWindowStyle> &SWIG_OUTPUT);
+       void setStyle(int style_id, eWindowStyle *style);
 private:
        static eWindowStyleManager *m_instance;
-       ePtr<eWindowStyle> m_current_style;
+       std::map<int, ePtr<eWindowStyle> > m_current_style;
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManager);
+SWIG_EXTEND(ePtr<eWindowStyleManager>,
+       static ePtr<eWindowStyleManager> getInstance()
+       {
+               extern ePtr<eWindowStyleManager> NewWindowStylePtr(void);
+               return NewWindowStylePtr();
+       }
+);
 
-TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManagerPtr);
-
+#ifndef SWIG
 class eWindowStyleSimple: public eWindowStyle
 {
        DECLARE_REF(eWindowStyleSimple);
@@ -77,5 +100,6 @@ public:
        void drawFrame(gPainter &painter, const eRect &frame, int what);
        RESULT getFont(int what, ePtr<gFont> &font);
 };
+#endif
 
 #endif