summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontends/amiga/clipboard.c8
-rw-r--r--frontends/amiga/download.c8
-rw-r--r--frontends/amiga/drag.c4
-rw-r--r--frontends/amiga/gui.c6
-rw-r--r--frontends/amiga/gui.h5
-rw-r--r--frontends/amiga/gui_menu.c2
-rwxr-xr-xfrontends/amiga/misc.c4
-rwxr-xr-xfrontends/amiga/search.c4
-rw-r--r--frontends/amiga/selectmenu.c2
-rw-r--r--frontends/amiga/theme.c10
10 files changed, 32 insertions, 21 deletions
diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c
index 1bcdbe7b3..a9d1f6170 100644
--- a/frontends/amiga/clipboard.c
+++ b/frontends/amiga/clipboard.c
@@ -86,14 +86,14 @@ void ami_clipboard_free(void)
void gui_start_selection(struct gui_window *g)
{
if(!g) return;
- if(!ami_gui_get_gui_window_2(g)->win) return;
+ if(!ami_gui_get_window(g)) return;
if(nsoption_bool(kiosk_mode) == true) return;
- ami_gui_menu_set_disabled(ami_gui_get_gui_window_2(g)->win, ami_gui_get_gui_window_2(g)->imenu, M_COPY, false);
- ami_gui_menu_set_disabled(ami_gui_get_gui_window_2(g)->win, ami_gui_get_gui_window_2(g)->imenu, M_CLEAR, false);
+ ami_gui_menu_set_disabled(ami_gui_get_window(g), ami_gui_get_gui_window_2(g)->imenu, M_COPY, false);
+ ami_gui_menu_set_disabled(ami_gui_get_window(g), ami_gui_get_gui_window_2(g)->imenu, M_CLEAR, false);
if (browser_window_get_editor_flags(ami_gui_get_browser_window(g)) & BW_EDITOR_CAN_CUT)
- ami_gui_menu_set_disabled(ami_gui_get_gui_window_2(g)->win, ami_gui_get_gui_window_2(g)->imenu, M_CUT, false);
+ ami_gui_menu_set_disabled(ami_gui_get_window(g), ami_gui_get_gui_window_2(g)->imenu, M_CUT, false);
}
static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size_t *text_length)
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index 3fcb21aa5..ed7a166d7 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -141,7 +141,7 @@ static struct gui_download_window *gui_download_window_create(download_context *
else
{
if(AslRequestTags(savereq,
- ASLFR_Window, ami_gui_get_gui_window_2(gui)->win,
+ ASLFR_Window, ami_gui_get_window(gui),
ASLFR_SleepWindow, TRUE,
ASLFR_TitleText, messages_get("NetSurf"),
ASLFR_Screen, scrn,
@@ -150,7 +150,7 @@ static struct gui_download_window *gui_download_window_create(download_context *
{
strlcpy(dw->fname, savereq->fr_Drawer, 1024);
AddPart((STRPTR)&dw->fname,savereq->fr_File,1024);
- if(!ami_download_check_overwrite(dw->fname, ami_gui_get_gui_window_2(gui)->win, total_size))
+ if(!ami_download_check_overwrite(dw->fname, ami_gui_get_window(gui), total_size))
{
free(dw);
return NULL;
@@ -434,7 +434,7 @@ gui_window_save_link(struct gui_window *g, nsurl *url, const char *title)
linkname = ASPrintf("Link_to_%s",FilePart(nsurl_access(url)));
if(AslRequestTags(savereq,
- ASLFR_Window, ami_gui_get_gui_window_2(g)->win,
+ ASLFR_Window, ami_gui_get_window(g),
ASLFR_SleepWindow, TRUE,
ASLFR_TitleText,messages_get("NetSurf"),
ASLFR_Screen,scrn,
@@ -446,7 +446,7 @@ gui_window_save_link(struct gui_window *g, nsurl *url, const char *title)
ami_set_pointer(ami_gui_get_gui_window_2(g), GUI_POINTER_WAIT, false);
- if(ami_download_check_overwrite(fname, ami_gui_get_gui_window_2(g)->win, 0))
+ if(ami_download_check_overwrite(fname, ami_gui_get_window(g), 0))
{
BPTR fh;
diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c
index 0555001b2..c022a9c3a 100644
--- a/frontends/amiga/drag.c
+++ b/frontends/amiga/drag.c
@@ -89,7 +89,7 @@ void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
break;
}
- ami_drag_icon_show(ami_gui_get_gui_window_2(g)->win, filetype);
+ ami_drag_icon_show(ami_gui_get_window(g), filetype);
drag_save_data = c;
drag_save_gui = g;
@@ -98,7 +98,7 @@ void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c,
void gui_drag_save_selection(struct gui_window *g, const char *selection)
{
- ami_drag_icon_show(ami_gui_get_gui_window_2(g)->win, "ascii");
+ ami_drag_icon_show(ami_gui_get_window(g), "ascii");
ami_autoscroll = true;
drag_save_data = g;
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 09de9d4e3..0c2944c0a 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -349,6 +349,12 @@ void ami_gui_set_throbbing(struct gui_window *gw, bool throbbing)
gw->throbbing = throbbing;
}
+struct Window *ami_gui_get_window(struct gui_window *gw)
+{
+ assert(gw != NULL);
+ assert(gw->shared != NULL);
+ return gw->shared->win;
+}
STRPTR ami_locale_langs(int *codeset)
{
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 39b0838c2..e65c0fe11 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -306,5 +306,10 @@ bool ami_gui_get_throbbing(struct gui_window *gw);
*/
void ami_gui_set_throbbing(struct gui_window *gw, bool throbbing);
+/**
+ * Get window from gui_window
+ */
+struct Window *ami_gui_get_window(struct gui_window *gw);
+
#endif
diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c
index fd8e1b8fa..1bb0ee8f4 100644
--- a/frontends/amiga/gui_menu.c
+++ b/frontends/amiga/gui_menu.c
@@ -711,7 +711,7 @@ 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 = ami_gui_get_gui_window_2(g)->win;
+ struct Window *win = ami_gui_get_window(g);
if(nsoption_bool(kiosk_mode) == true) return;
diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c
index e1332a02c..9bd8bfe60 100755
--- a/frontends/amiga/misc.c
+++ b/frontends/amiga/misc.c
@@ -53,7 +53,7 @@ static LONG ami_misc_req(const char *message, uint32 type)
TDR_FormatString, message,
TDR_GadgetString, messages_get("OK"),
TDR_ImageType, type,
- TDR_Window, cur_gw ? ami_gui_get_gui_window_2(cur_gw)->win : NULL,
+ TDR_Window, cur_gw ? ami_gui_get_window(cur_gw) : NULL,
TAG_DONE);
#else
struct EasyStruct easyreq = {
@@ -64,7 +64,7 @@ static LONG ami_misc_req(const char *message, uint32 type)
messages_get("OK"),
};
- ret = EasyRequest(cur_gw ? ami_gui_get_gui_window_2(cur_gw)->win : NULL, &easyreq, NULL);
+ ret = EasyRequest(cur_gw ? ami_gui_get_window(cur_gw) : NULL, &easyreq, NULL);
#endif
return ret;
}
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index fcb508ebd..b210fd484 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -278,7 +278,7 @@ static BOOL ami_search_event(void *w)
ami_gui_get_browser_window(fwin->gwin),
NULL,
flags, ami_search_string());
- ActivateWindow(ami_gui_get_gui_window_2(fwin->gwin)->win);
+ ActivateWindow(ami_gui_get_window(fwin->gwin));
break;
case GID_S_PREV:
@@ -289,7 +289,7 @@ static BOOL ami_search_event(void *w)
ami_gui_get_browser_window(fwin->gwin),
NULL,
flags, ami_search_string());
- ActivateWindow(ami_gui_get_gui_window_2(fwin->gwin)->win);
+ ActivateWindow(ami_gui_get_window(fwin->gwin));
break;
}
break;
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index 63763a420..06f43ccf7 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -168,7 +168,7 @@ void gui_create_form_select_menu(struct gui_window *g,
ami_set_pointer(ami_gui_get_gui_window_2(g), GUI_POINTER_DEFAULT, false); // Clear the menu-style pointer
- IDoMethod(selectmenuobj, PM_OPEN, ami_gui_get_gui_window_2(g)->win);
+ IDoMethod(selectmenuobj, PM_OPEN, ami_gui_get_window(g));
/* PM_OPEN is blocking, so dispose menu immediately... */
if(selectmenuobj) DisposeObject(selectmenuobj);
diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c
index 92686fdee..8e2f47059 100644
--- a/frontends/amiga/theme.c
+++ b/frontends/amiga/theme.c
@@ -433,7 +433,7 @@ void gui_window_start_throbber(struct gui_window *g)
{
SetClickTabNodeAttrs(ami_gui_get_tab_node(g), TNA_Flagged, TRUE, TAG_DONE);
RefreshGadgets((APTR)ami_gui_get_gui_window_2(g)->objects[GID_TABS],
- ami_gui_get_gui_window_2(g)->win, NULL);
+ ami_gui_get_window(g), NULL);
}
#endif
@@ -454,7 +454,7 @@ void gui_window_stop_throbber(struct gui_window *g)
{
SetClickTabNodeAttrs(ami_gui_get_tab_node(g), TNA_Flagged, FALSE, TAG_DONE);
RefreshGadgets((APTR)ami_gui_get_gui_window_2(g)->objects[GID_TABS],
- ami_gui_get_gui_window_2(g)->win, NULL);
+ ami_gui_get_window(g), NULL);
}
#endif
@@ -465,7 +465,7 @@ void gui_window_stop_throbber(struct gui_window *g)
}
if(throbber != NULL) {
- BltBitMapRastPort(throbber, 0, 0, ami_gui_get_gui_window_2(g)->win->RPort,
+ BltBitMapRastPort(throbber, 0, 0, ami_gui_get_window(g)->RPort,
bbox->Left, bbox->Top,
ami_theme_throbber_get_width(), ami_theme_throbber_get_height(),
0x0C0);
@@ -508,14 +508,14 @@ static void ami_throbber_update(void *p)
BLITA_Width, ami_theme_throbber_get_width(),
BLITA_Height, ami_theme_throbber_get_height(),
BLITA_Source, throbber,
- BLITA_Dest, ami_gui_get_gui_window_2(g)->win->RPort,
+ BLITA_Dest, ami_gui_get_window(g)->RPort,
BLITA_SrcType, BLITT_BITMAP,
BLITA_DestType, BLITT_RASTPORT,
// BLITA_UseSrcAlpha, TRUE,
TAG_DONE);
#else
BltBitMapRastPort(throbber, ami_theme_throbber_get_width() * frame,
- 0, ami_gui_get_gui_window_2(g)->win->RPort,
+ 0, ami_gui_get_window(g)->RPort,
bbox->Left, bbox->Top,
ami_theme_throbber_get_width(), ami_theme_throbber_get_height(),
0xC0);