diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 2 | ||||
| -rw-r--r-- | desktop/gui_factory.c | 17 | ||||
| -rw-r--r-- | desktop/gui_misc.h | 5 | ||||
| -rw-r--r-- | desktop/gui_window.h | 5 |
4 files changed, 15 insertions, 14 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 3eaa733b8..10df156e5 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1604,7 +1604,7 @@ static nserror browser_window_callback(hlcache_handle *c, if (event->data.select_menu.gadget->type == GADGET_SELECT) { struct browser_window *root = browser_window_get_root(bw); - guit->browser->create_form_select_menu(root->window, + guit->window->create_form_select_menu(root->window, event->data.select_menu.gadget); } diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c index c0cf0ffc5..e7770e770 100644 --- a/desktop/gui_factory.c +++ b/desktop/gui_factory.c @@ -108,6 +108,11 @@ static void gui_default_window_remove_caret(struct gui_window *g) { } +static void gui_default_window_create_form_select_menu(struct gui_window *g, + struct form_control *control) +{ +} + static void gui_default_window_file_gadget_open(struct gui_window *g, hlcache_handle *hl, struct form_control *gadget) @@ -211,6 +216,10 @@ static nserror verify_window_register(struct gui_window_table *gwt) if (gwt->scroll_start == NULL) { gwt->scroll_start = gui_default_window_scroll_start; } + if (gwt->create_form_select_menu == NULL) { + gwt->create_form_select_menu = + gui_default_window_create_form_select_menu; + } if (gwt->file_gadget_open == NULL) { gwt->file_gadget_open = gui_default_window_file_gadget_open; } @@ -541,11 +550,6 @@ static nserror gui_default_launch_url(struct nsurl *url) return NSERROR_NO_FETCH_HANDLER; } -static void gui_default_create_form_select_menu(struct gui_window *g, - struct form_control *control) -{ -} - static void gui_default_cert_verify(nsurl *url, const struct ssl_cert_info *certs, @@ -589,9 +593,6 @@ static nserror verify_browser_register(struct gui_browser_table *gbt) if (gbt->launch_url == NULL) { gbt->launch_url = gui_default_launch_url; } - if (gbt->create_form_select_menu == NULL) { - gbt->create_form_select_menu = gui_default_create_form_select_menu; - } if (gbt->cert_verify == NULL) { gbt->cert_verify = gui_default_cert_verify; } diff --git a/desktop/gui_misc.h b/desktop/gui_misc.h index 5c47668e3..daad6ba2e 100644 --- a/desktop/gui_misc.h +++ b/desktop/gui_misc.h @@ -70,11 +70,6 @@ struct gui_browser_table { nserror (*launch_url)(struct nsurl *url); /** - * create a form select menu - */ - void (*create_form_select_menu)(struct gui_window *gw, struct form_control *control); - - /** * verify certificate */ void (*cert_verify)(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw); diff --git a/desktop/gui_window.h b/desktop/gui_window.h index f5240a6b4..e503d4b86 100644 --- a/desktop/gui_window.h +++ b/desktop/gui_window.h @@ -267,6 +267,11 @@ struct gui_window_table { void (*new_content)(struct gui_window *g); /** + * create a form select menu + */ + void (*create_form_select_menu)(struct gui_window *gw, struct form_control *control); + + /** * Called when file chooser gadget is activated */ void (*file_gadget_open)(struct gui_window *g, struct hlcache_handle *hl, struct form_control *gadget); |