diff options
author | rathnor <rathnor> | 2004-08-29 12:35:29 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-08-29 12:35:29 (GMT) |
commit | ef9565efd8431eed3f561154c58765d5a77be90a (patch) | |
tree | dc0de9202454de040cd88db5e076d1ded565a4e7 /src/FbTk/Menu.hh | |
parent | 92dc8d745214ac4f8c81bbad6d529a19fb4fe46c (diff) | |
download | fluxbox_pavel-ef9565efd8431eed3f561154c58765d5a77be90a.zip fluxbox_pavel-ef9565efd8431eed3f561154c58765d5a77be90a.tar.bz2 |
fix crash bug when windowmenu doesn't include extramenus
improve checking of existence/success of loading windowmenu file
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 57894b8..d5f6b83 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.38 2004/08/03 21:25:51 fluxgen Exp $ | 25 | // $Id: Menu.hh,v 1.39 2004/08/29 12:35:29 rathnor Exp $ |
26 | 26 | ||
27 | #ifndef FBTK_MENU_HH | 27 | #ifndef FBTK_MENU_HH |
28 | #define FBTK_MENU_HH | 28 | #define FBTK_MENU_HH |
@@ -162,6 +162,9 @@ public: | |||
162 | /// @return true if index is valid | 162 | /// @return true if index is valid |
163 | inline bool validIndex(int index) const { return (index < static_cast<int>(numberOfItems()) && index >= 0); } | 163 | inline bool validIndex(int index) const { return (index < static_cast<int>(numberOfItems()) && index >= 0); } |
164 | 164 | ||
165 | inline Menu *parent() { return m_parent; } | ||
166 | inline const Menu *parent() const { return m_parent; } | ||
167 | |||
165 | protected: | 168 | protected: |
166 | 169 | ||
167 | inline void setTitleVisibility(bool b) { | 170 | inline void setTitleVisibility(bool b) { |
@@ -179,8 +182,6 @@ protected: | |||
179 | unsigned int width= 0, unsigned int height= 0); | 182 | unsigned int width= 0, unsigned int height= 0); |
180 | virtual void redrawTitle(); | 183 | virtual void redrawTitle(); |
181 | virtual void internal_hide(); | 184 | virtual void internal_hide(); |
182 | inline Menu *parent() { return m_parent; } | ||
183 | inline const Menu *parent() const { return m_parent; } | ||
184 | 185 | ||
185 | void update(FbTk::Subject *); | 186 | void update(FbTk::Subject *); |
186 | void renderTransp(int x, int y, | 187 | void renderTransp(int x, int y, |