diff options
author | fluxgen <fluxgen> | 2003-07-10 11:55:49 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-07-10 11:55:49 (GMT) |
commit | 23d0b998883bdd25254a3accc49cd515908e6fbe (patch) | |
tree | 9b0a8ffcb831e7c8cbcc961b0411ef13a94c844c | |
parent | 2ed0befbad3370727a1ea2c122ed1da42e69af32 (diff) | |
download | fluxbox-23d0b998883bdd25254a3accc49cd515908e6fbe.zip fluxbox-23d0b998883bdd25254a3accc49cd515908e6fbe.tar.bz2 |
fixed so we can extend reconfigure
-rw-r--r-- | src/FbTk/Menu.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index 82a253d..5ddd617 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.17 2003/07/03 12:23:28 fluxgen Exp $ | 25 | // $Id: Menu.hh,v 1.18 2003/07/10 11:55:49 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef FBTK_MENU_HH | 27 | #ifndef FBTK_MENU_HH |
28 | #define FBTK_MENU_HH | 28 | #define FBTK_MENU_HH |
@@ -112,7 +112,7 @@ public: | |||
112 | //@} | 112 | //@} |
113 | /// get input focus | 113 | /// get input focus |
114 | void grabInputFocus(); | 114 | void grabInputFocus(); |
115 | void reconfigure(); | 115 | virtual void reconfigure(); |
116 | /// set label string | 116 | /// set label string |
117 | void setLabel(const char *labelstr); | 117 | void setLabel(const char *labelstr); |
118 | /// move menu to x,y | 118 | /// move menu to x,y |
@@ -139,6 +139,8 @@ public: | |||
139 | Window window() const { return menu.window.window(); } | 139 | Window window() const { return menu.window.window(); } |
140 | FbWindow &fbwindow() { return menu.window; } | 140 | FbWindow &fbwindow() { return menu.window; } |
141 | const FbWindow &fbwindow() const { return menu.window; } | 141 | const FbWindow &fbwindow() const { return menu.window; } |
142 | FbWindow &titleWindow() { return menu.title; } | ||
143 | FbWindow &frameWindow() { return menu.frame; } | ||
142 | const std::string &label() const { return menu.label; } | 144 | const std::string &label() const { return menu.label; } |
143 | int x() const { return menu.x; } | 145 | int x() const { return menu.x; } |
144 | int y() const { return menu.y; } | 146 | int y() const { return menu.y; } |
@@ -150,6 +152,7 @@ public: | |||
150 | bool hasSubmenu(unsigned int index) const; | 152 | bool hasSubmenu(unsigned int index) const; |
151 | bool isItemSelected(unsigned int index) const; | 153 | bool isItemSelected(unsigned int index) const; |
152 | bool isItemEnabled(unsigned int index) const; | 154 | bool isItemEnabled(unsigned int index) const; |
155 | const MenuTheme &theme() const { return m_theme; } | ||
153 | static unsigned char alpha() { return s_alpha; } | 156 | static unsigned char alpha() { return s_alpha; } |
154 | static Menu *focused() { return s_focused; } | 157 | static Menu *focused() { return s_focused; } |
155 | /// @return menuitem at index | 158 | /// @return menuitem at index |
@@ -180,7 +183,6 @@ private: | |||
180 | const MenuTheme &m_theme; | 183 | const MenuTheme &m_theme; |
181 | Display *m_display; | 184 | Display *m_display; |
182 | const int m_screen_num; | 185 | const int m_screen_num; |
183 | Window m_prev_focused_window; | ||
184 | Menu *m_parent; | 186 | Menu *m_parent; |
185 | ImageControl &m_image_ctrl; | 187 | ImageControl &m_image_ctrl; |
186 | Menuitems menuitems; | 188 | Menuitems menuitems; |