mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-18 16:49:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't pass browser_window around for select menu handling.

Browse Source 
It was only needed to access gui_window, so just padd gui_window.
This commit is contained in:
Michael Drake 2014-10-16 12:05:18 +01:00
parent 925082cbe1
commit cb54fc6ed2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
riscos/window.c
View File

@ -158,7 +158,7 @@ static void ro_gui_window_clone_options(
struct gui_window *new_gui,
struct gui_window *old_gui);
static bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
static bool ro_gui_window_prepare_form_select_menu(struct gui_window *bw,
struct form_control *control);
static void ro_gui_window_process_form_select_menu(struct gui_window *g,
wimp_selection *selection);
@ -1366,13 +1366,15 @@ void gui_create_form_select_menu(struct browser_window *bw,
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, control))
if (!ro_gui_window_prepare_form_select_menu(bw->window, control))
return;
error = xwimp_get_pointer_info(&pointer);
@ -1384,8 +1386,6 @@ void gui_create_form_select_menu(struct browser_window *bw,
return;
}
bw = browser_window_get_root(bw);
gui_form_select_control = control;
ro_gui_menu_create(gui_form_select_menu,
pointer.pos.x, pointer.pos.y, bw->window->window);
@ -2167,7 +2167,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
*/
if (menu == gui_form_select_menu) {
return ro_gui_window_prepare_form_select_menu(g->bw,
return ro_gui_window_prepare_form_select_menu(g,
gui_form_select_control);
}
@ -4692,7 +4692,7 @@ void ro_gui_window_default_options(struct browser_window *bw)
* \return true if the menu is OK to be opened; else false.
*/
bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
bool ro_gui_window_prepare_form_select_menu(struct gui_window *g,
struct form_control *control)
{
unsigned int i, entries;
@ -4711,7 +4711,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
return false;
}
ro_gui_select_menu_bw = bw;
ro_gui_select_menu_bw = g->bw;
if ((gui_form_select_menu) && (control != gui_form_select_control)) {
for (i = 0; ; i++) {