From 63645c4c322a392e6d5a72f34534a515653bac32 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 16 Oct 2014 12:39:31 +0100 Subject: Fix core create_form_select_menu API to pass gw, rather than bw out to front ends. --- riscos/gui.h | 2 +- riscos/window.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'riscos') diff --git a/riscos/gui.h b/riscos/gui.h index 11c2cf995..e4a99ebc5 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -158,7 +158,7 @@ bool ro_gui_shift_pressed(void); bool ro_gui_ctrl_pressed(void); bool ro_gui_alt_pressed(void); void gui_window_set_pointer(struct gui_window *g, enum gui_pointer_shape shape); -void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control); +void gui_create_form_select_menu(struct gui_window *g, struct form_control *control); /* in history.c */ void ro_gui_history_init(void); diff --git a/riscos/window.c b/riscos/window.c index a978ccbd6..3dffd1cb6 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1354,25 +1354,23 @@ void gui_window_set_extent(struct gui_window *g, int width, int height) /** * Display a menu of options for a form select control. * - * \param bw browser window containing form control + * \param g gui window containing form control * \param control form control of type GADGET_SELECT */ -void gui_create_form_select_menu(struct browser_window *bw, +void gui_create_form_select_menu(struct gui_window *g, struct form_control *control) { os_error *error; wimp_pointer pointer; - bw = browser_window_get_root(bw); - /* The first time the menu is opened, control bypasses the normal * Menu Prepare event and so we prepare here. On any re-opens, * ro_gui_window_prepare_form_select_menu() is called from the * normal wimp event. */ - if (!ro_gui_window_prepare_form_select_menu(bw->window, control)) + if (!ro_gui_window_prepare_form_select_menu(g, control)) return; error = xwimp_get_pointer_info(&pointer); @@ -1386,7 +1384,7 @@ void gui_create_form_select_menu(struct browser_window *bw, gui_form_select_control = control; ro_gui_menu_create(gui_form_select_menu, - pointer.pos.x, pointer.pos.y, bw->window->window); + pointer.pos.x, pointer.pos.y, g->window); } -- cgit v1.2.3