diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-01-31 18:46:45 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-01-31 18:46:45 +0000 |
| commit | 356461244e9a31d9c22fab358cdf95cb3f22364f (patch) | |
| tree | 1af88f190b336a0aa172e4e371115f492dc27ef1 /riscos/window.c | |
| parent | f99b17ae89ee27ff746346c17c03b1ee5ab3076b (diff) | |
| parent | 0114cc825d8a23ff99ce3a667aebc0ed21b0339f (diff) | |
| download | netsurf-356461244e9a31d9c22fab358cdf95cb3f22364f.tar.gz netsurf-356461244e9a31d9c22fab358cdf95cb3f22364f.tar.bz2 | |
Merge remote-tracking branch 'origin/stevef/menus'
Diffstat (limited to 'riscos/window.c')
| -rw-r--r-- | riscos/window.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/riscos/window.c b/riscos/window.c index 164460850..ed0f9e297 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -654,7 +654,7 @@ static void gui_window_destroy(struct gui_window *g) ro_gui_url_complete_close(); ro_gui_dialog_close_persistent(w); if (current_menu_window == w) - ro_gui_menu_closed(); + ro_gui_menu_destroy(); ro_gui_window_remove_update_boxes(g); /* delete window */ @@ -1395,7 +1395,7 @@ void gui_create_form_select_menu(struct browser_window *bw, LOG(("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess)); warn_user("WimpError", error->errmess); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return; } @@ -4811,7 +4811,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw, option = option->next) entries++; if (entries == 0) { - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return false; } @@ -4835,7 +4835,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw, gui_form_select_menu = malloc(wimp_SIZEOF_MENU(entries)); if (!gui_form_select_menu) { warn_user("NoMemory", 0); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return false; } err = utf8_to_local_encoding(messages_get("SelectMenu"), 0, @@ -4845,7 +4845,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw, assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_local_encoding failed")); warn_user("NoMemory", 0); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return false; } gui_form_select_menu->title_data.indirected_text.text = @@ -4870,7 +4870,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw, if (!temp) { LOG(("cnv_space2nbsp failed")); warn_user("NoMemory", 0); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return false; } @@ -4882,7 +4882,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw, assert(err != NSERROR_BAD_ENCODING); LOG(("utf8_to_enc failed")); warn_user("NoMemory", 0); - ro_gui_menu_closed(); + ro_gui_menu_destroy(); return false; } |