diff options
-rw-r--r-- | src/FbTk/Menu.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 9109913..7b18520 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc | |||
@@ -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.cc,v 1.70 2004/07/05 09:40:08 fluxgen Exp $ | 25 | // $Id: Menu.cc,v 1.71 2004/07/14 18:30:37 fluxgen Exp $ |
26 | 26 | ||
27 | //use GNU extensions | 27 | //use GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -283,7 +283,7 @@ void Menu::lower() { | |||
283 | 283 | ||
284 | void Menu::nextItem() { | 284 | void Menu::nextItem() { |
285 | int old_which_press = which_press; | 285 | int old_which_press = which_press; |
286 | 286 | m_active_index = -1; | |
287 | if (validIndex(old_which_press) && | 287 | if (validIndex(old_which_press) && |
288 | menuitems[old_which_press] != 0) { | 288 | menuitems[old_which_press] != 0) { |
289 | if (menuitems[old_which_press]->submenu()) { | 289 | if (menuitems[old_which_press]->submenu()) { |
@@ -320,7 +320,7 @@ void Menu::nextItem() { | |||
320 | void Menu::prevItem() { | 320 | void Menu::prevItem() { |
321 | 321 | ||
322 | int old_which_press = which_press; | 322 | int old_which_press = which_press; |
323 | 323 | m_active_index = -1; | |
324 | if (validIndex(old_which_press)) { | 324 | if (validIndex(old_which_press)) { |
325 | if (menuitems[old_which_press]->submenu()) { | 325 | if (menuitems[old_which_press]->submenu()) { |
326 | // we need to do this explicitly on the menu.window | 326 | // we need to do this explicitly on the menu.window |
@@ -980,8 +980,8 @@ int Menu::drawItem(unsigned int index, bool clear, bool render_trans, | |||
980 | 980 | ||
981 | 981 | ||
982 | if (clear) { | 982 | if (clear) { |
983 | menu.frame.clearArea(item_x, item_y, | 983 | frameWindow().clearArea(item_x, item_y, |
984 | menu.item_w, theme().itemHeight(), False); | 984 | menu.item_w, theme().itemHeight(), False); |
985 | } | 985 | } |
986 | 986 | ||
987 | 987 | ||