remove unneeded workaround

[vuplus_dvbapp] / lib / gui / ewindowstyle.h

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index f11d99d..c204a03 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -7,37 +7,82 @@ 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, const eSize &size) = 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);
+#ifdef SWIG
+       eWindowStyleManager();
+       ~eWindowStyleManager();
+#endif
+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(int style_id, ePtr<eWindowStyle> &SWIG_OUTPUT);
+       void setStyle(int style_id, eWindowStyle *style);
+private:
+       static eWindowStyleManager *m_instance;
+       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();
+       }
+);
 
+#ifndef SWIG
 class eWindowStyleSimple: public eWindowStyle
 {
        DECLARE_REF(eWindowStyleSimple);
@@ -48,53 +93,13 @@ private:
        int m_border_top, m_border_left, m_border_right, m_border_bottom;
 public:
        eWindowStyleSimple();
-       void handleNewSize(eWindow *wnd, const eSize &size);
+       void handleNewSize(eWindow *wnd, eSize &size, eSize &offset);
        void paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title);
        void paintBackground(gPainter &painter, const ePoint &offset, const eSize &size);
        void setStyle(gPainter &painter, int what);
        void drawFrame(gPainter &painter, const eRect &frame, int what);
        RESULT getFont(int what, ePtr<gFont> &font);
 };
-
-#if 0
-class eWindowStyleSkinned: public eWindowStyle
-{
-       DECLARE_REF(eWindowStyleSkinned);
-public:
-       eWindowStyleSkinned();
-       void handleNewSize(eWindow *wnd, const eSize &size);
-       void paintWindowDecoration(eWindow *wnd, gPainter &painter, const std::string &title);
-       void paintBackground(gPainter &painter, const ePoint &offset, const eSize &size);
-       void setStyle(gPainter &painter, int what);
-       void drawFrame(gPainter &painter, const eRect &frame, int what);
-       
-       enum {
-               bsWindow,
-               bsButton,
-#ifndef SWIG
-               bsMax
-#endif
-       };
-       
-       enum {
-               bpTopLeft     =     1,
-               bpTop         =     2,
-               bpTopRight    =     4,
-               bpLeft        =     8,
-               bpRight       =  0x10,
-               bpBottomLeft  =  0x20,
-               bpBottom      =  0x40,
-               bpBottomRight =  0x80,
-               bpBackground  = 0x100
-       };
-private:
-       struct borderSet
-       {
-               ePtr<gPixmap> m_pixmap[9];
-       };
-       
-       void drawBorder(gPainter &painter, const eSize &size, const struct borderSet &border, int where);
-};
 #endif
 
 #endif