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.hh14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 333f6d8..9a3f425 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Menu.hh,v 1.24 2003/12/08 16:39:44 fluxgen Exp $ 25// $Id: Menu.hh,v 1.25 2003/12/10 23:08:06 fluxgen Exp $
26 26
27#ifndef FBTK_MENU_HH 27#ifndef FBTK_MENU_HH
28#define FBTK_MENU_HH 28#define FBTK_MENU_HH
@@ -57,7 +57,7 @@ public:
57 */ 57 */
58 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND }; 58 enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND };
59 59
60 Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl); 60 Menu(MenuTheme &tm, ImageControl &imgctrl);
61 virtual ~Menu(); 61 virtual ~Menu();
62 62
63 /** 63 /**
@@ -132,7 +132,7 @@ public:
132 //@{ 132 //@{
133 inline bool isTorn() const { return torn; } 133 inline bool isTorn() const { return torn; }
134 inline bool isVisible() const { return visible; } 134 inline bool isVisible() const { return visible; }
135 inline int screenNumber() const { return m_screen_num; } 135 inline int screenNumber() const { return menu.window.screenNumber(); }
136 inline Window window() const { return menu.window.window(); } 136 inline Window window() const { return menu.window.window(); }
137 inline FbWindow &fbwindow() { return menu.window; } 137 inline FbWindow &fbwindow() { return menu.window; }
138 inline const FbWindow &fbwindow() const { return menu.window; } 138 inline const FbWindow &fbwindow() const { return menu.window; }
@@ -141,8 +141,8 @@ public:
141 inline const std::string &label() const { return menu.label; } 141 inline const std::string &label() const { return menu.label; }
142 inline int x() const { return menu.x; } 142 inline int x() const { return menu.x; }
143 inline int y() const { return menu.y; } 143 inline int y() const { return menu.y; }
144 inline unsigned int width() const { return menu.width; } 144 inline unsigned int width() const { return menu.window.width(); }
145 inline unsigned int height() const { return menu.height; } 145 inline unsigned int height() const { return menu.window.height(); }
146 inline unsigned int numberOfItems() const { return menuitems.size(); } 146 inline unsigned int numberOfItems() const { return menuitems.size(); }
147 inline int currentSubmenu() const { return which_sub; } 147 inline int currentSubmenu() const { return which_sub; }
148 inline unsigned int titleHeight() const { return menu.title_h; } 148 inline unsigned int titleHeight() const { return menu.title_h; }
@@ -178,8 +178,6 @@ private:
178 178
179 typedef std::vector<MenuItem *> Menuitems; 179 typedef std::vector<MenuItem *> Menuitems;
180 const MenuTheme &m_theme; 180 const MenuTheme &m_theme;
181 Display *m_display;
182 const int m_screen_num;
183 Menu *m_parent; 181 Menu *m_parent;
184 ImageControl &m_image_ctrl; 182 ImageControl &m_image_ctrl;
185 Menuitems menuitems; 183 Menuitems menuitems;
@@ -198,7 +196,7 @@ private:
198 std::string label; 196 std::string label;
199 int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub, 197 int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub,
200 grab_x, grab_y; 198 grab_x, grab_y;
201 unsigned int width, height, title_h, frame_h, item_w, item_h, bevel_w, 199 unsigned int title_h, frame_h, item_w, item_h, bevel_w,
202 bevel_h; 200 bevel_h;
203 } menu; 201 } menu;
204 202