diff options
-rw-r--r-- | src/Basemenu.hh | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/Basemenu.hh b/src/Basemenu.hh index 9e87ef4..07d166f 100644 --- a/src/Basemenu.hh +++ b/src/Basemenu.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: Basemenu.hh,v 1.17 2002/09/10 10:48:44 fluxgen Exp $ | 25 | // $Id: Basemenu.hh,v 1.18 2002/10/15 10:57:58 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef BASEMENU_HH | 27 | #ifndef BASEMENU_HH |
28 | #define BASEMENU_HH | 28 | #define BASEMENU_HH |
@@ -94,18 +94,19 @@ public: | |||
94 | @name accessors | 94 | @name accessors |
95 | */ | 95 | */ |
96 | //@{ | 96 | //@{ |
97 | inline bool isTorn() const { return torn; } | 97 | bool isTorn() const { return torn; } |
98 | inline bool isVisible() const { return visible; } | 98 | bool isVisible() const { return visible; } |
99 | inline BScreen *screen() const { return m_screen; } | 99 | const BScreen *screen() const { return m_screen; } |
100 | inline Window windowID() const { return menu.window; } | 100 | BScreen *screen() { return m_screen; } |
101 | inline const std::string &label() const { return menu.label; } | 101 | Window windowID() const { return menu.window; } |
102 | inline int x() const { return menu.x; } | 102 | const std::string &label() const { return menu.label; } |
103 | inline int y() const { return menu.y; } | 103 | int x() const { return menu.x; } |
104 | inline unsigned int width() const { return menu.width; } | 104 | int y() const { return menu.y; } |
105 | inline unsigned int height() const { return menu.height; } | 105 | unsigned int width() const { return menu.width; } |
106 | inline unsigned int numberOfItems() const { return menuitems.size(); } | 106 | unsigned int height() const { return menu.height; } |
107 | inline int currentSubmenu() const { return which_sub; } | 107 | unsigned int numberOfItems() const { return menuitems.size(); } |
108 | inline unsigned int titleHeight() const { return menu.title_h; } | 108 | int currentSubmenu() const { return which_sub; } |
109 | unsigned int titleHeight() const { return menu.title_h; } | ||
109 | bool hasSubmenu(unsigned int index) const; | 110 | bool hasSubmenu(unsigned int index) const; |
110 | bool isItemSelected(unsigned int index) const; | 111 | bool isItemSelected(unsigned int index) const; |
111 | bool isItemEnabled(unsigned int index) const; | 112 | bool isItemEnabled(unsigned int index) const; |
@@ -157,7 +158,7 @@ private: | |||
157 | }; | 158 | }; |
158 | 159 | ||
159 | /** | 160 | /** |
160 | A menu item | 161 | A menu item in Basemenu |
161 | */ | 162 | */ |
162 | class BasemenuItem { | 163 | class BasemenuItem { |
163 | public: | 164 | public: |