diff options
Diffstat (limited to 'src/FbTk/Menu.hh')
-rw-r--r-- | src/FbTk/Menu.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index d1c6c6e..7c8b6ef 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.28 2003/12/17 00:43:22 fluxgen Exp $ | 25 | // $Id: Menu.hh,v 1.29 2003/12/18 18:03:23 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FBTK_MENU_HH | 27 | #ifndef FBTK_MENU_HH |
28 | #define FBTK_MENU_HH | 28 | #define FBTK_MENU_HH |
@@ -140,8 +140,8 @@ public: | |||
140 | inline FbWindow &titleWindow() { return menu.title; } | 140 | inline FbWindow &titleWindow() { return menu.title; } |
141 | inline FbWindow &frameWindow() { return menu.frame; } | 141 | inline FbWindow &frameWindow() { return menu.frame; } |
142 | inline const std::string &label() const { return menu.label; } | 142 | inline const std::string &label() const { return menu.label; } |
143 | inline int x() const { return menu.x; } | 143 | inline int x() const { return menu.window.x(); } |
144 | inline int y() const { return menu.y; } | 144 | inline int y() const { return menu.window.y(); } |
145 | inline unsigned int width() const { return menu.window.width(); } | 145 | inline unsigned int width() const { return menu.window.width(); } |
146 | inline unsigned int height() const { return menu.window.height(); } | 146 | inline unsigned int height() const { return menu.window.height(); } |
147 | inline unsigned int numberOfItems() const { return menuitems.size(); } | 147 | inline unsigned int numberOfItems() const { return menuitems.size(); } |
@@ -203,7 +203,7 @@ private: | |||
203 | FbTk::FbWindow window, frame, title; | 203 | FbTk::FbWindow window, frame, title; |
204 | 204 | ||
205 | std::string label; | 205 | std::string label; |
206 | int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub, | 206 | int x_move, y_move, x_shift, y_shift, sublevels, persub, minsub, |
207 | grab_x, grab_y; | 207 | grab_x, grab_y; |
208 | unsigned int title_h, frame_h, item_w, item_h, bevel_w, | 208 | unsigned int title_h, frame_h, item_w, item_h, bevel_w, |
209 | bevel_h; | 209 | bevel_h; |