fix typo, add newline

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

diff --git a/lib/gui/ewindowstyle.h b/lib/gui/ewindowstyle.h
index 08ea0a4179105292471819c8a712a359268ffafe..4824aad62c44a2f8bcdd9ffa5d619ac428e785cd 100644 (file)
--- a/lib/gui/ewindowstyle.h
+++ b/lib/gui/ewindowstyle.h
@@ -18,7 +18,8 @@ public:
                styleLabel,
                styleListboxSelected,
                styleListboxNormal,
-               styleListboxMarked
+               styleListboxMarked,
+               styleListboxMarkedAndSelected
        };
        
        virtual void drawFrame(gPainter &painter, const eRect &frame, int type) = 0;
@@ -41,15 +42,21 @@ public:
 class eWindowStyleManager: public iObject
 {
        DECLARE_REF(eWindowStyleManager);
+#ifdef SWIG
+       eWindowStyleManager();
+       ~eWindowStyleManager();
+#endif
 public:
+#ifndef SWIG
        eWindowStyleManager();
        ~eWindowStyleManager();
-       void getStyle(ePtr<eWindowStyle> &style);
-       void setStyle(eWindowStyle *style);
+#endif
+       void getStyle(int style_id, ePtr<eWindowStyle> &style);
+       void setStyle(int style_id, eWindowStyle *style);
        static int getInstance(ePtr<eWindowStyleManager> &mgr) { mgr = m_instance; if (!mgr) return -1; return 0; }
 private:
        static eWindowStyleManager *m_instance;
-       ePtr<eWindowStyle> m_current_style;
+       std::map<int, ePtr<eWindowStyle> > m_current_style;
 };
 
 TEMPLATE_TYPEDEF(ePtr<eWindowStyleManager>, eWindowStyleManagerPtr);