aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index e719053..2f37234 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -55,7 +55,7 @@ public:
55 */ 55 */
56 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND }; 56 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND };
57 57
58 Menu(MenuTheme &tm, ImageControl &imgctrl); 58 Menu(FbTk::ThemeProxy<MenuTheme> &tm, ImageControl &imgctrl);
59 virtual ~Menu(); 59 virtual ~Menu();
60 60
61 /** 61 /**
@@ -151,8 +151,9 @@ public:
151 bool isItemSelected(unsigned int index) const; 151 bool isItemSelected(unsigned int index) const;
152 bool isItemEnabled(unsigned int index) const; 152 bool isItemEnabled(unsigned int index) const;
153 bool isItemSelectable(unsigned int index) const; 153 bool isItemSelectable(unsigned int index) const;
154 const MenuTheme &theme() const { return m_theme; } 154 FbTk::ThemeProxy<MenuTheme> &theme() { return m_theme; }
155 unsigned char alpha() const { return theme().alpha(); } 155 const FbTk::ThemeProxy<MenuTheme> &theme() const { return m_theme; }
156 unsigned char alpha() const { return theme()->alpha(); }
156 static Menu *shownMenu() { return shown; } 157 static Menu *shownMenu() { return shown; }
157 static Menu *focused() { return s_focused; } 158 static Menu *focused() { return s_focused; }
158 static void hideShownMenu(); 159 static void hideShownMenu();
@@ -198,7 +199,7 @@ private:
198 void startHide(); 199 void startHide();
199 void stopHide(); 200 void stopHide();
200 201
201 MenuTheme &m_theme; 202 FbTk::ThemeProxy<MenuTheme> &m_theme;
202 Menu *m_parent; 203 Menu *m_parent;
203 ImageControl &m_image_ctrl; 204 ImageControl &m_image_ctrl;
204 205