diff options
| author | Mathias Gumz <akira at fluxbox dot org> | 2011-01-15 20:37:45 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2011-01-15 20:37:45 (GMT) |
| commit | 05a52116dfa39a07bc5739340eb1a84660c96e25 (patch) | |
| tree | 9460e7f37bca4eca4c60ec7dea5a1c26569e8c3e | |
| parent | bb480030f54947b19b761f37dd3c4756b361b5e1 (diff) | |
| download | fluxbox_paul-05a52116dfa39a07bc5739340eb1a84660c96e25.zip fluxbox_paul-05a52116dfa39a07bc5739340eb1a84660c96e25.tar.bz2 | |
MenuItem::isEnabled() is sufficient to decide Menu::isItemSelectable()
MenuSeparator is never enabled since it returns always 'false' in its
implementation of isEnabled(). no need to use RTTI imho.
| -rw-r--r-- | src/FbTk/Menu.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index f46efb0..5531410 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
| @@ -842,9 +842,7 @@ bool Menu::isItemSelectable(unsigned int index) const { | |||
| 842 | if (index >= menuitems.size()) return false; | 842 | if (index >= menuitems.size()) return false; |
| 843 | 843 | ||
| 844 | const MenuItem *item = find(index); | 844 | const MenuItem *item = find(index); |
| 845 | return (!item || | 845 | return (!item || !item->isEnabled()) ? false : true; |
| 846 | (typeid(*item) == typeid(FbTk::MenuSeparator)) || | ||
| 847 | !item->isEnabled()) ? false : true; | ||
| 848 | } | 846 | } |
| 849 | 847 | ||
| 850 | 848 | ||