Make gui_window private to gui.c

TODO: ratonalise these accessors

1 files changed, 47 insertions, 47 deletions

diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c
index 6dbacf1ba..fd8e1b8fa 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(gwin->gw->bw));
+	ami_file_save_req(type, gwin, browser_window_get_content(ami_gui_get_browser_window(gwin->gw)));
 }
 
 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(gwin->gw->bw);
+	browser_window_destroy(ami_gui_get_browser_window(gwin->gw));
 }
 
 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(gwin->gw->bw));
+	ami_print_ui(browser_window_get_content(ami_gui_get_browser_window(gwin->gw)));
 	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(gwin->gw->bw, NS_KEY_CUT_SELECTION);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), 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(gwin->gw->bw)) {
-		browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION);
-		browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION);
+	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);
 	}
-	else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) {
+	else if((bm = content_get_bitmap(browser_window_get_content(ami_gui_get_browser_window(gwin->gw))))) {
 		/** @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(gwin->gw->bw));
-		ami_bitmap_set_title(bm, browser_window_get_title(gwin->gw->bw));
+		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_easy_clipboard_bitmap(bm);
 	}
 #ifdef WITH_NS_SVG
-	else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) {
-		ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw));
+	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)));
 	}
 #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(gwin->gw->bw, NS_KEY_PASTE);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_PASTE);
 }
 
 HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *)
@@ -285,7 +285,7 @@ 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(gwin->gw->bw, NS_KEY_SELECT_ALL);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_SELECT_ALL);
 	gui_start_selection(gwin->gw);
 }
 
@@ -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(gwin->gw->bw, NS_KEY_CLEAR_SELECTION);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), 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(gwin->gw->bw, NS_KEY_UNDO);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), 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(gwin->gw->bw, NS_KEY_REDO);
+	browser_window_key_press(ami_gui_get_browser_window(gwin->gw), NS_KEY_REDO);
 }
 
 HOOKF(void, ami_menu_item_browser_find, 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_set_scale(gwin->gw, gwin->gw->scale - 0.1);
+	ami_gui_adjust_scale(gwin->gw, -0.1);
 }
 
 HOOKF(void, ami_menu_item_browser_scale_normal, 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_set_scale(gwin->gw, gwin->gw->scale + 0.1);
+	ami_gui_adjust_scale(gwin->gw, +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 = gwin->gw->bw;
+	bw = ami_gui_get_browser_window(gwin->gw);
 
 	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(gwin->gw->bw,
+	browser_window_navigate(ami_gui_get_browser_window(gwin->gw),
 					url,
 					NULL,
 					BW_NAVIGATE_HISTORY,
@@ -711,19 +711,19 @@ void ami_gui_menu_update_checked(struct gui_window_2 *gwin)
 
 void ami_gui_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c)
 {
-	struct Window *win = g->shared->win;
+	struct Window *win = ami_gui_get_gui_window_2(g)->win;
 
 	if(nsoption_bool(kiosk_mode) == true) return;
 
 	if(content_get_type(c) <= CONTENT_CSS)
 	{
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVETXT, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVECOMP, false);
 #ifdef WITH_PDF_EXPORT
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVEPDF, false);
 #endif
 #if 0
-		if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) {
+		if(browser_window_get_editor_flags(ami_gui_get_browser_window(g)) & BW_EDITOR_CAN_COPY) {
 			OnMenu(win,AMI_MENU_COPY);
 			OnMenu(win,AMI_MENU_CLEAR);
 		} else {
@@ -731,39 +731,39 @@ void ami_gui_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c
 			OffMenu(win,AMI_MENU_CLEAR);	
 		}
 
-		if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT)
+		if(browser_window_get_editor_flags(ami_gui_get_browser_window(g)) & BW_EDITOR_CAN_CUT)
 			OnMenu(win,AMI_MENU_CUT);
 		else
 			OffMenu(win,AMI_MENU_CUT);		
 		
-		if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_PASTE)
+		if(browser_window_get_editor_flags(ami_gui_get_browser_window(g)) & BW_EDITOR_CAN_PASTE)
 			OnMenu(win,AMI_MENU_PASTE);
 		else
 			OffMenu(win,AMI_MENU_PASTE);
 #else
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_CUT, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_PASTE, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_CLEAR, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_CUT, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_COPY, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_PASTE, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_CLEAR, false);
 #endif
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SELALL, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_FIND, false);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SELALL, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_FIND, false);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVEIFF, true);
 	}
 	else
 	{
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_CUT, true);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_PASTE, true);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_CLEAR, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_CUT, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_PASTE, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_CLEAR, true);
 
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, true);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVETXT, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVECOMP, true);
 #ifdef WITH_PDF_EXPORT
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVEPDF, true);
 #endif
 
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_SELALL, true);
-		ami_gui_menu_set_disabled(win, g->shared->imenu, M_FIND, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SELALL, true);
+		ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_FIND, true);
 
 #ifdef WITH_NS_SVG
 		if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true))
@@ -771,13 +771,13 @@ void ami_gui_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c
 		if(content_get_bitmap(c))
 #endif
 		{
-			ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, false);
-			ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, false);
+			ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_COPY, false);
+			ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVEIFF, false);
 		}
 		else
 		{
-			ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, true);
-			ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true);
+			ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_COPY, true);
+			ami_gui_menu_set_disabled(win, ami_gui_get_gui_window_2(g)->imenu, M_SAVEIFF, true);
 		}
 	}
 }