From ca1a519cfad66978c18181b4a544b485f69aee90 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Wed, 8 May 2019 00:08:35 +0100 Subject: remove direct access to gui_window_2's gui_window --- frontends/amiga/arexx.c | 4 ++-- frontends/amiga/clipboard.c | 4 ++-- frontends/amiga/ctxmenu.c | 44 +++++++++++++++++++-------------------- frontends/amiga/file.c | 4 ++-- frontends/amiga/gui.c | 14 ++++++++++++- frontends/amiga/gui.h | 12 +++++++++++ frontends/amiga/gui_menu.c | 50 ++++++++++++++++++++++----------------------- frontends/amiga/history.c | 2 +- frontends/amiga/hotlist.c | 2 +- frontends/amiga/theme.c | 4 ++-- 10 files changed, 82 insertions(+), 58 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index b2e2ac89e..6d1bdf12b 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -191,7 +191,7 @@ static struct gui_window *ami_find_tab_gwin(struct gui_window_2 *gwin, int tab) struct Node *ntab; struct gui_window *gw; - if((tab == 0) || (gwin->tabs == 0)) return gwin->gw; + if((tab == 0) || (gwin->tabs == 0)) return ami_gui2_get_gui_window(gwin); ctab = GetHead(&gwin->tab_list); @@ -625,7 +625,7 @@ RXHOOKF(rx_active) if(node->Type == AMINS_WINDOW) { windows++; - if(gwin->gw == gw) + if(IS_CURRENT_GW(gwin,gw)) { window = windows; break; diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index ae3d22e3f..7a5c5f4d9 100644 --- a/frontends/amiga/clipboard.c +++ b/frontends/amiga/clipboard.c @@ -288,8 +288,8 @@ void ami_drag_selection(struct gui_window *g) iffh = ami_clipboard_init_internal(1); browser_window_key_press(ami_gui_get_browser_window(g), NS_KEY_COPY_SELECTION); - browser_window_mouse_click(ami_gui_get_browser_window(gwin->gw), BROWSER_MOUSE_PRESS_1, x, y); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_PASTE); + browser_window_mouse_click(ami_gui2_get_browser_window(gwin), BROWSER_MOUSE_PRESS_1, x, y); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_PASTE); ami_clipboard_free_internal(iffh); iffh = old_iffh; diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c index f0a2a204e..b245324cd 100644 --- a/frontends/amiga/ctxmenu.c +++ b/frontends/amiga/ctxmenu.c @@ -107,8 +107,8 @@ HOOKF(void, ami_ctxmenu_item_selcopy, APTR, window, struct IntuiMessage *) { struct gui_window_2 *gwin = (struct gui_window_2 *)hook->h_Data; - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_COPY_SELECTION); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_CLEAR_SELECTION); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_COPY_SELECTION); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_CLEAR_SELECTION); } HOOKF(void, ami_ctxmenu_item_websearch, APTR, window, struct IntuiMessage *) @@ -117,11 +117,11 @@ HOOKF(void, ami_ctxmenu_item_websearch, APTR, window, struct IntuiMessage *) nsurl *url; struct gui_window_2 *gwin = (struct gui_window_2 *)hook->h_Data; - char *sel = browser_window_get_selection(ami_gui_get_browser_window(gwin->gw)); + char *sel = browser_window_get_selection(ami_gui2_get_browser_window(gwin)); ret = search_web_omni(sel, SEARCH_WEB_OMNI_SEARCHONLY, &url); if (ret == NSERROR_OK) { - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, NULL, BW_NAVIGATE_HISTORY, @@ -146,8 +146,8 @@ HOOKF(void, ami_ctxmenu_item_urlopentab, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); nserror error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY | BW_CREATE_TAB, url, - browser_window_access_url(ami_gui_get_browser_window(gwin->gw)), - ami_gui_get_browser_window(gwin->gw), + browser_window_access_url(ami_gui2_get_browser_window(gwin)), + ami_gui2_get_browser_window(gwin), &bw); if (error != NSERROR_OK) @@ -163,8 +163,8 @@ HOOKF(void, ami_ctxmenu_item_urlopenwin, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); nserror error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY, url, - browser_window_access_url(ami_gui_get_browser_window(gwin->gw)), - ami_gui_get_browser_window(gwin->gw), + browser_window_access_url(ami_gui2_get_browser_window(gwin)), + ami_gui2_get_browser_window(gwin), &bw); if (error != NSERROR_OK) @@ -178,9 +178,9 @@ HOOKF(void, ami_ctxmenu_item_urldownload, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, - browser_window_access_url(ami_gui_get_browser_window(gwin->gw)), + browser_window_access_url(ami_gui2_get_browser_window(gwin)), BW_NAVIGATE_DOWNLOAD, NULL, NULL, @@ -198,9 +198,9 @@ HOOKF(void, ami_ctxmenu_item_objshow, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), hlcache_handle_get_url(hook->h_Data), - browser_window_access_url(ami_gui_get_browser_window(gwin->gw)), + browser_window_access_url(ami_gui2_get_browser_window(gwin)), BW_NAVIGATE_HISTORY, NULL, NULL, @@ -238,9 +238,9 @@ HOOKF(void, ami_ctxmenu_item_frameshow, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), hlcache_handle_get_url(hook->h_Data), - browser_window_access_url(ami_gui_get_browser_window(gwin->gw)), + browser_window_access_url(ami_gui2_get_browser_window(gwin)), BW_NAVIGATE_HISTORY, NULL, NULL, @@ -271,7 +271,7 @@ HOOKF(void, ami_ctxmenu_item_history, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_history_go(ami_gui_get_browser_window(gwin->gw), + browser_window_history_go(ami_gui2_get_browser_window(gwin), (struct history_entry *)hook->h_Data, false); } @@ -301,7 +301,7 @@ static uint32 ami_ctxmenu_hook_func(struct Hook *hook, struct Window *window, st Object *root_menu; bool ctxmenu_has_content = false; struct gui_window_2 *gwin = hook->h_Data; - struct hlcache_handle *cc = browser_window_get_content(ami_gui_get_browser_window(gwin->gw)); + struct hlcache_handle *cc = browser_window_get_content(ami_gui2_get_browser_window(gwin)); struct browser_window_features ccdata; int mx = window->MouseX; int my = window->MouseY; @@ -329,11 +329,11 @@ static uint32 ami_ctxmenu_hook_func(struct Hook *hook, struct Window *window, st return 0; } - browser_window_get_features(ami_gui_get_browser_window(gwin->gw), x, y, &ccdata); + browser_window_get_features(ami_gui2_get_browser_window(gwin), x, y, &ccdata); - if((browser_window_can_select(ami_gui_get_browser_window(gwin->gw))) && - ((browser_window_get_editor_flags(ami_gui_get_browser_window(gwin->gw)) & BW_EDITOR_CAN_COPY)) && - (sel = browser_window_get_selection(ami_gui_get_browser_window(gwin->gw)))) { + if((browser_window_can_select(ami_gui2_get_browser_window(gwin))) && + ((browser_window_get_editor_flags(ami_gui2_get_browser_window(gwin)) & BW_EDITOR_CAN_COPY)) && + (sel = browser_window_get_selection(ami_gui2_get_browser_window(gwin)))) { ami_ctxmenu_add_item(root_menu, AMI_CTX_ID_SELCOPY, gwin); ami_ctxmenu_add_item(root_menu, AMI_CTX_ID_WEBSEARCH, gwin); @@ -568,9 +568,9 @@ struct Menu *ami_ctxmenu_history_create(int direction, struct gui_window_2 *gwin gwin->temp = 0; if(direction == AMI_CTXMENU_HISTORY_BACK) { - browser_window_history_enumerate_back(ami_gui_get_browser_window(gwin->gw), ami_ctxmenu_history_back, gwin); + browser_window_history_enumerate_back(ami_gui2_get_browser_window(gwin), ami_ctxmenu_history_back, gwin); } else { - browser_window_history_enumerate_forward(ami_gui_get_browser_window(gwin->gw), ami_ctxmenu_history_forward, gwin); + browser_window_history_enumerate_forward(ami_gui2_get_browser_window(gwin), ami_ctxmenu_history_forward, gwin); } } diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c index 4d02ddf49..1d74d6ff8 100644 --- a/frontends/amiga/file.c +++ b/frontends/amiga/file.c @@ -100,7 +100,7 @@ void ami_file_open(struct gui_window_2 *gwin) if (netsurf_path_to_nsurl(temp, &url) != NSERROR_OK) { amiga_warn_user("NoMemory", 0); } else { - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, NULL, BW_NAVIGATE_HISTORY, @@ -268,7 +268,7 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin, AddPart(fname, savereq->fr_File, 1024); ami_file_save(type, fname, ami_gui2_get_window(gwin), object, - ami_gui_get_favicon(gwin->gw), ami_gui_get_browser_window(gwin->gw)); + ami_gui_get_favicon(ami_gui2_get_gui_window(gwin)), ami_gui2_get_browser_window(gwin)); } if(fname) free(fname); diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 6db8434fb..55d57d52b 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -288,13 +288,19 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh nsoptions[NSOPTION_##OPTION].value.i = VALUE; \ nsoptions_default[NSOPTION_##OPTION].value.i = VALUE -/* Function documented in gui.h */ +/* Functions documented in gui.h */ struct browser_window *ami_gui_get_browser_window(struct gui_window *gw) { assert(gw != NULL); return gw->bw; } +struct browser_window *ami_gui2_get_browser_window(struct gui_window_2 *gwin) +{ + assert(gwin != NULL); + return ami_gui_get_browser_window(gwin->gw); +} + struct List *ami_gui_get_download_list(struct gui_window *gw) { assert(gw != NULL); @@ -307,6 +313,12 @@ struct gui_window_2 *ami_gui_get_gui_window_2(struct gui_window *gw) return gw->shared; } +struct gui_window *ami_gui2_get_gui_window(struct gui_window_2 *gwin) +{ + assert(gwin != NULL); + return gwin->gw; +} + const char *ami_gui_get_tab_title(struct gui_window *gw) { assert(gw != NULL); diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 6b0818920..6877bee9e 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -157,6 +157,8 @@ extern struct Screen *scrn; extern struct MsgPort *sport; extern struct gui_window *cur_gw; +#define IS_CURRENT_GW(GWIN,GW) (ami_gui2_get_gui_window(GWIN) == GW) + /* The return value for these functions must be deallocated using FreeVec() */ STRPTR ami_locale_langs(int *codeset); char *ami_gui_get_cache_favicon_name(struct nsurl *url, bool only_if_avail); @@ -261,11 +263,21 @@ void ami_gui_adjust_scale(struct gui_window *gw, float adjustment); */ struct browser_window *ami_gui_get_browser_window(struct gui_window *gw); +/** + * Get browser window from gui_window_2 + */ +struct browser_window *ami_gui2_get_browser_window(struct gui_window_2 *gwin); + /** * Get gui_window_2 from gui_window */ struct gui_window_2 *ami_gui_get_gui_window_2(struct gui_window *gw); +/** + * Get gui_window from gui_window_2 + */ +struct gui_window *ami_gui2_get_gui_window(struct gui_window_2 *gwin); + /** * Get download list from gui_window */ diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c index f82384b77..425643284 100644 --- a/frontends/amiga/gui_menu.c +++ b/frontends/amiga/gui_menu.c @@ -141,7 +141,7 @@ HOOKF(void, ami_menu_item_project_save, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_file_save_req(type, gwin, browser_window_get_content(ami_gui_get_browser_window(gwin->gw))); + ami_file_save_req(type, gwin, browser_window_get_content(ami_gui2_get_browser_window(gwin))); } HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) @@ -149,7 +149,7 @@ HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_destroy(ami_gui_get_browser_window(gwin->gw)); + browser_window_destroy(ami_gui2_get_browser_window(gwin)); } HOOKF(void, ami_menu_item_project_closewin, APTR, window, struct IntuiMessage *) @@ -166,7 +166,7 @@ HOOKF(void, ami_menu_item_project_print, APTR, window, struct IntuiMessage *) GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - ami_print_ui(browser_window_get_content(ami_gui_get_browser_window(gwin->gw))); + ami_print_ui(browser_window_get_content(ami_gui2_get_browser_window(gwin))); ami_reset_pointer(gwin); } @@ -243,7 +243,7 @@ HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_CUT_SELECTION); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_CUT_SELECTION); } HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) @@ -252,22 +252,22 @@ HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(browser_window_can_select(ami_gui_get_browser_window(gwin->gw))) { - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_COPY_SELECTION); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_CLEAR_SELECTION); + if(browser_window_can_select(ami_gui2_get_browser_window(gwin))) { + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_COPY_SELECTION); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_CLEAR_SELECTION); } - else if((bm = content_get_bitmap(browser_window_get_content(ami_gui_get_browser_window(gwin->gw))))) { + else if((bm = content_get_bitmap(browser_window_get_content(ami_gui2_get_browser_window(gwin))))) { /** @todo It should be checked that the lifetime of * the objects containing the values returned (and the * constness cast away) is safe. */ - ami_bitmap_set_url(bm, browser_window_access_url(ami_gui_get_browser_window(gwin->gw))); - ami_bitmap_set_title(bm, browser_window_get_title(ami_gui_get_browser_window(gwin->gw))); + ami_bitmap_set_url(bm, browser_window_access_url(ami_gui2_get_browser_window(gwin))); + ami_bitmap_set_title(bm, browser_window_get_title(ami_gui2_get_browser_window(gwin))); ami_easy_clipboard_bitmap(bm); } #ifdef WITH_NS_SVG - else if(ami_mime_compare(browser_window_get_content(ami_gui_get_browser_window(gwin->gw)), "svg") == true) { - ami_easy_clipboard_svg(browser_window_get_content(ami_gui_get_browser_window(gwin->gw))); + else if(ami_mime_compare(browser_window_get_content(ami_gui2_get_browser_window(gwin)), "svg") == true) { + ami_easy_clipboard_svg(browser_window_get_content(ami_gui2_get_browser_window(gwin))); } #endif } @@ -277,7 +277,7 @@ HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_PASTE); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_PASTE); } HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) @@ -285,8 +285,8 @@ HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_SELECT_ALL); - gui_start_selection(gwin->gw); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_SELECT_ALL); + gui_start_selection(ami_gui2_get_gui_window(gwin)); } HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) @@ -294,7 +294,7 @@ HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_CLEAR_SELECTION); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_CLEAR_SELECTION); } HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) @@ -302,7 +302,7 @@ HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_UNDO); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_UNDO); } HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) @@ -310,7 +310,7 @@ HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_REDO); + browser_window_key_press(ami_gui2_get_browser_window(gwin), NS_KEY_REDO); } HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) @@ -318,7 +318,7 @@ HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_search_open(gwin->gw); + ami_search_open(ami_gui2_get_gui_window(gwin)); } HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessage *) @@ -326,7 +326,7 @@ HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessag struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_history_local_present(gwin->gw); + ami_history_local_present(ami_gui2_get_gui_window(gwin)); } HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessage *) @@ -380,7 +380,7 @@ HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMess struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_gui_adjust_scale(gwin->gw, -0.1); + ami_gui_adjust_scale(ami_gui2_get_gui_window(gwin), -0.1); } HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *) @@ -388,7 +388,7 @@ HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessag struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_gui_set_scale(gwin->gw, 1.0); + ami_gui_set_scale(ami_gui2_get_gui_window(gwin), 1.0); } HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMessage *) @@ -396,7 +396,7 @@ HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMess struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_gui_adjust_scale(gwin->gw, +0.1); + ami_gui_adjust_scale(ami_gui2_get_gui_window(gwin), +0.1); } HOOKF(void, ami_menu_item_browser_redraw, APTR, window, struct IntuiMessage *) @@ -414,7 +414,7 @@ HOOKF(void, ami_menu_item_hotlist_add, APTR, window, struct IntuiMessage *) struct gui_window_2 *gwin; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - bw = ami_gui_get_browser_window(gwin->gw); + bw = ami_gui2_get_browser_window(gwin); if (bw == NULL || browser_window_has_content(bw) == false) return; @@ -436,7 +436,7 @@ HOOKF(void, ami_menu_item_hotlist_entries, APTR, window, struct IntuiMessage *) if(url == NULL) return; - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, NULL, BW_NAVIGATE_HISTORY, diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c index 1b75ad4a5..2cd2f8466 100644 --- a/frontends/amiga/history.c +++ b/frontends/amiga/history.c @@ -203,7 +203,7 @@ ami_history_global_drag_end(struct ami_corewindow *ami_cw, int x, int y) DisplayBeep(scrn); } else if(url) { if((gwin = ami_window_at_pointer(AMINS_WINDOW))) { - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, NULL, BW_NAVIGATE_HISTORY, diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c index 7740d5323..e8cf3a14c 100644 --- a/frontends/amiga/hotlist.c +++ b/frontends/amiga/hotlist.c @@ -254,7 +254,7 @@ ami_hotlist_drag_end(struct ami_corewindow *ami_cw, int x, int y) DisplayBeep(scrn); } else if(url) { if((gwin = ami_window_at_pointer(AMINS_WINDOW))) { - browser_window_navigate(ami_gui_get_browser_window(gwin->gw), + browser_window_navigate(ami_gui2_get_browser_window(gwin), url, NULL, BW_NAVIGATE_HISTORY, diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c index f41d04b99..c20d02527 100644 --- a/frontends/amiga/theme.c +++ b/frontends/amiga/theme.c @@ -458,7 +458,7 @@ void gui_window_stop_throbber(struct gui_window *g) } #endif - if(g == ami_gui_get_gui_window_2(g)->gw) { + if(IS_CURRENT_GW(ami_gui_get_gui_window_2(g), g)) { if(ami_gui_get_space_box(ami_gui_get_gui_window_2(g)->objects[GID_THROBBER], &bbox) != NSERROR_OK) { amiga_warn_user("NoMemory", ""); return; @@ -493,7 +493,7 @@ static void ami_throbber_update(void *p) ami_gui_get_gui_window_2(g)->throbber_frame=1; } - if(ami_gui_get_gui_window_2(g)->gw == g) { + if(IS_CURRENT_GW(ami_gui_get_gui_window_2(g),g)) { if(ami_gui_get_space_box(ami_gui_get_gui_window_2(g)->objects[GID_THROBBER], &bbox) != NSERROR_OK) { amiga_warn_user("NoMemory", ""); return; -- cgit v1.2.3