diff options
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r-- | src/FbTk/Menu.hh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index f16c443..54c6d62 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh | |||
@@ -203,13 +203,12 @@ private: | |||
203 | void startHide(); | 203 | void startHide(); |
204 | void stopHide(); | 204 | void stopHide(); |
205 | 205 | ||
206 | |||
207 | typedef std::vector<MenuItem *> Menuitems; | ||
208 | MenuTheme &m_theme; | 206 | MenuTheme &m_theme; |
209 | Menu *m_parent; | 207 | Menu *m_parent; |
210 | ImageControl &m_image_ctrl; | 208 | ImageControl &m_image_ctrl; |
211 | Menuitems menuitems; | ||
212 | 209 | ||
210 | typedef std::vector<MenuItem *> Menuitems; | ||
211 | Menuitems menuitems; | ||
213 | TypeAhead<Menuitems, MenuItem *> m_type_ahead; | 212 | TypeAhead<Menuitems, MenuItem *> m_type_ahead; |
214 | Menuitems m_matches; | 213 | Menuitems m_matches; |
215 | 214 | ||
@@ -242,6 +241,8 @@ private: | |||
242 | 241 | ||
243 | int m_active_index; ///< current highlighted index | 242 | int m_active_index; ///< current highlighted index |
244 | 243 | ||
244 | std::auto_ptr<FbTk::Shape> m_shape; | ||
245 | |||
245 | Drawable m_root_pm; | 246 | Drawable m_root_pm; |
246 | static Menu *shown; ///< used for determining if there's a menu open at all | 247 | static Menu *shown; ///< used for determining if there's a menu open at all |
247 | static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused | 248 | static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused |