diff options
| author | Steve Fryatt <stevef@netsurf-browser.org> | 2014-01-29 16:54:34 +0000 |
|---|---|---|
| committer | Steve Fryatt <stevef@netsurf-browser.org> | 2014-01-29 16:54:34 +0000 |
| commit | 0114cc825d8a23ff99ce3a667aebc0ed21b0339f (patch) | |
| tree | 5d6e0a143cb02d5a655bfe13f187a726221981f4 /riscos/wimp_event.c | |
| parent | 829b4fd4546670512f8543c8bc8ed80372566f08 (diff) | |
| download | netsurf-0114cc825d8a23ff99ce3a667aebc0ed21b0339f.tar.gz netsurf-0114cc825d8a23ff99ce3a667aebc0ed21b0339f.tar.bz2 | |
Provide a dedicated interface for destroying open menus.
Add ro_gui_menu_destroy(), so that this specific task does not share the same code as the more general task of tidying up after menus have been closed by other means.
The original ro_gui_menu_closed() now simply cleans up from a known (or assumed) closure, without forcing a closure itself.
Diffstat (limited to 'riscos/wimp_event.c')
| -rw-r--r-- | riscos/wimp_event.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index a84c016ad..d048b9a1e 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -719,7 +719,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) } ro_gui_dialog_add_persistent(current_menu_window, pointer->w); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); error = xwimp_open_window(PTR_WIMP_OPEN(&open)); if (error) { LOG(("xwimp_open_window: 0x%x: %s", @@ -768,7 +768,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) if (pointer->buttons & wimp_CLICK_SELECT) { ro_gui_dialog_close(pointer->w); ro_gui_wimp_event_close_window(pointer->w); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); } else { ro_gui_wimp_event_restore(pointer->w); } @@ -850,7 +850,7 @@ void ro_gui_wimp_event_ok_click(struct event_window *window, if (state & wimp_CLICK_SELECT) { ro_gui_dialog_close(window->w); ro_gui_wimp_event_close_window(window->w); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); } else { ro_gui_wimp_event_memorise(window->w); } @@ -1045,7 +1045,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key) return false; ro_gui_dialog_close(key->w); ro_gui_wimp_event_close_window(key->w); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return true; /* Return performs the OK action */ case wimp_KEY_RETURN: @@ -1772,7 +1772,7 @@ bool ro_gui_wimp_event_submenu_warning(wimp_w w, wimp_i i, wimp_menu *menu, } /** - * Handle menus being closed. This is called from ro_gui_menu_closed(), in + * Handle menus being closed. This is called from the menus modules, in * every scenario when one of our own menus is open. * * \param w the window to owning the menu |