diff options
Diffstat (limited to 'frontends/amiga/gui.c')
| -rw-r--r-- | frontends/amiga/gui.c | 252 |
1 files changed, 126 insertions, 126 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 8eb34fb92..2c4b31511 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -2119,12 +2119,12 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - gwin->objects[GID_HSCROLL] = ScrollerObj, + gwin->objects[GID_HSCROLL] = (ScrollerObj, GA_ID, GID_HSCROLL, GA_RelVerify, TRUE, SCROLLER_Orientation, SORIENT_HORIZ, ICA_TARGET, ICTARGET_IDCMP, - ScrollerEnd; + ScrollerEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_HSCROLL], attrs); @@ -2165,11 +2165,11 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - gwin->objects[GID_VSCROLL] = ScrollerObj, + gwin->objects[GID_VSCROLL] = (ScrollerObj, GA_ID, GID_VSCROLL, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, - ScrollerEnd; + ScrollerEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_VSCROLL], attrs); @@ -2277,13 +2277,13 @@ static void ami_gui_console_log_add(struct gui_window *g) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - g->shared->objects[GID_LOG] = ListBrowserObj, + g->shared->objects[GID_LOG] = (ListBrowserObj, GA_ID, GID_LOG, LISTBROWSER_ColumnInfo, g->logcolumns, LISTBROWSER_ColumnTitles, TRUE, LISTBROWSER_Labels, &g->loglist, LISTBROWSER_Striping, LBS_ROWS, - ListBrowserEnd; + ListBrowserEnd); #ifdef __amigaos4__ IDoMethod(g->shared->objects[GID_LOGLAYOUT], LM_ADDCHILD, @@ -4023,12 +4023,12 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, if (iconname == NULL) iconname = ASPrintf("icons/content.png"); ami_locate_resource(menu_icon, iconname); - tb_userdata->gw->hotlist_toolbar_lab[item] = BitMapObj, + tb_userdata->gw->hotlist_toolbar_lab[item] = (BitMapObj, IA_Scalable, TRUE, BITMAP_Screen, scrn, BITMAP_SourceFile, menu_icon, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); /* \todo make this scale the bitmap to these dimensions */ SetAttrs(tb_userdata->gw->hotlist_toolbar_lab[item], @@ -4036,13 +4036,13 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, BITMAP_Height, 16, TAG_DONE); - Object *lab_item = LabelObj, + Object *lab_item = (LabelObj, // LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, LABEL_Image, tb_userdata->gw->hotlist_toolbar_lab[item], LABEL_Text, " ", LABEL_Text, utf8title, - LabelEnd; + LabelEnd); free(utf8title); @@ -4082,18 +4082,18 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { gwin->objects[GID_HOTLIST] = - SpeedBarObj, + (SpeedBarObj, GA_ID, GID_HOTLIST, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, SPEEDBAR_BevelStyle, BVS_NONE, SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, - SpeedBarEnd; + SpeedBarEnd); gwin->objects[GID_HOTLISTSEPBAR] = - BevelObj, + (BevelObj, BEVEL_Style, BVS_SBAR_VERT, - BevelEnd; + BevelEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_HOTLIST], attrs); @@ -4228,7 +4228,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show) attrs[2].ti_Tag = TAG_DONE; attrs[2].ti_Data = 0; - gwin->objects[GID_TABS] = ClickTabObj, + gwin->objects[GID_TABS] = (ClickTabObj, GA_ID, GID_TABS, GA_RelVerify, TRUE, GA_Underscore, 13, // disable kb shortcuts @@ -4237,15 +4237,15 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show) CLICKTAB_LabelTruncate, TRUE, CLICKTAB_CloseImage, gwin->objects[GID_CLOSETAB_BM], CLICKTAB_FlagImage, gwin->objects[GID_TABS_FLAG], - ClickTabEnd; + ClickTabEnd); - gwin->objects[GID_ADDTAB] = ButtonObj, + gwin->objects[GID_ADDTAB] = (ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_HintInfo, gwin->helphints[GID_ADDTAB], GA_Text, "+", BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM], - ButtonEnd; + ButtonEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_TABS], NULL); @@ -4970,101 +4970,101 @@ gui_window_create(struct browser_window *bw, ami_get_theme_filename(pi_secure, "theme_pageinfo_secure", false); ami_get_theme_filename(pi_warning, "theme_pageinfo_warning", false); - g->shared->objects[GID_FAVE_ADD] = BitMapObj, + g->shared->objects[GID_FAVE_ADD] = (BitMapObj, BITMAP_SourceFile, fave, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_FAVE_RMV] = BitMapObj, + g->shared->objects[GID_FAVE_RMV] = (BitMapObj, BITMAP_SourceFile, unfave, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_ADDTAB_BM] = BitMapObj, + g->shared->objects[GID_ADDTAB_BM] = (BitMapObj, BITMAP_SourceFile, addtab, BITMAP_SelectSourceFile, addtab_s, BITMAP_DisabledSourceFile, addtab_g, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_CLOSETAB_BM] = BitMapObj, + g->shared->objects[GID_CLOSETAB_BM] = (BitMapObj, BITMAP_SourceFile, closetab, BITMAP_SelectSourceFile, closetab_s, BITMAP_DisabledSourceFile, closetab_g, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_INSECURE_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_INSECURE_BM] = (BitMapObj, BITMAP_SourceFile, pi_insecure, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = (BitMapObj, BITMAP_SourceFile, pi_internal, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_LOCAL_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_LOCAL_BM] = (BitMapObj, BITMAP_SourceFile, pi_local, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_SECURE_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_SECURE_BM] = (BitMapObj, BITMAP_SourceFile, pi_secure, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_WARNING_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_WARNING_BM] = (BitMapObj, BITMAP_SourceFile, pi_warning, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); if(ClickTabBase->lib_Version < 53) { addtabclosegadget = LAYOUT_AddChild; - g->shared->objects[GID_CLOSETAB] = ButtonObj, + g->shared->objects[GID_CLOSETAB] = (ButtonObj, GA_ID, GID_CLOSETAB, GA_RelVerify, TRUE, BUTTON_RenderImage, g->shared->objects[GID_CLOSETAB_BM], - ButtonEnd; + ButtonEnd); - g->shared->objects[GID_TABS] = ClickTabObj, + g->shared->objects[GID_TABS] = (ClickTabObj, GA_ID,GID_TABS, GA_RelVerify,TRUE, GA_Underscore,13, // disable kb shortcuts CLICKTAB_Labels,&g->shared->tab_list, CLICKTAB_LabelTruncate,TRUE, - ClickTabEnd; + ClickTabEnd); - g->shared->objects[GID_ADDTAB] = ButtonObj, + g->shared->objects[GID_ADDTAB] = (ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_Text, "+", BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM], - ButtonEnd; + ButtonEnd); } else { - g->shared->objects[GID_TABS_FLAG] = BitMapObj, + g->shared->objects[GID_TABS_FLAG] = (BitMapObj, BITMAP_SourceFile, tabthrobber, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd; + BitMapEnd); } NSLOG(netsurf, INFO, "Creating window object"); - g->shared->objects[OID_MAIN] = WindowObj, + g->shared->objects[OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, TRUE, @@ -5097,109 +5097,109 @@ gui_window_create(struct browser_window *bw, WINDOW_BuiltInScroll, TRUE, WINDOW_GadgetHelp, TRUE, WINDOW_UserData, g->shared, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutVObj, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutVObj, LAYOUT_DeferLayout, defer_layout, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = (LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_BACK] = (ButtonObj, GA_ID, GID_BACK, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_BACK, g->shared), GA_HintInfo, g->shared->helphints[GID_BACK], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,nav_west, BITMAP_SelectSourceFile,nav_west_s, BITMAP_DisabledSourceFile,nav_west_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = (ButtonObj, GA_ID, GID_FORWARD, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_FORWARD, g->shared), GA_HintInfo, g->shared->helphints[GID_FORWARD], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,nav_east, BITMAP_SelectSourceFile,nav_east_s, BITMAP_DisabledSourceFile,nav_east_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_STOP] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_STOP] = (ButtonObj, GA_ID,GID_STOP, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_STOP], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,stop, BITMAP_SelectSourceFile,stop_s, BITMAP_DisabledSourceFile,stop_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = (ButtonObj, GA_ID,GID_RELOAD, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_RELOAD], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,reload, BITMAP_SelectSourceFile,reload_s, BITMAP_DisabledSourceFile,reload_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_HOME] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_HOME] = (ButtonObj, GA_ID,GID_HOME, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_HOME], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,home, BITMAP_SelectSourceFile,home_s, BITMAP_DisabledSourceFile,home_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutHObj, // FavIcon, URL bar and hotlist star + LAYOUT_AddChild, (LayoutHObj, // FavIcon, URL bar and hotlist star LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_ICON] = (SpaceObj, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, SPACE_Transparent, TRUE, // SPACE_RenderHook, &g->shared->favicon_hook, - SpaceEnd, + SpaceEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, - LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = (ButtonObj, GA_ID, GID_PAGEINFO, GA_RelVerify, TRUE, GA_ReadOnly, FALSE, BUTTON_RenderImage, g->shared->objects[GID_PAGEINFO_INTERNAL_BM], - ButtonEnd, + ButtonEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, LAYOUT_AddChild, g->shared->objects[GID_URL] = #ifdef __amigaos4__ NewObject(urlStringClass, NULL, #else - StringObj, + (StringObj, #endif STRINGA_MaxChars, 2000, GA_ID, GID_URL, @@ -5210,59 +5210,59 @@ gui_window_create(struct browser_window *bw, #ifdef __amigaos4__ STRINGVIEW_Header, URLHistory_GetList(), #endif - TAG_DONE), - LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObj, + TAG_DONE)), + LAYOUT_AddChild, g->shared->objects[GID_FAVE] = (ButtonObj, GA_ID, GID_FAVE, GA_RelVerify, TRUE, // GA_HintInfo, g->shared->helphints[GID_FAVE], BUTTON_RenderImage, g->shared->objects[GID_FAVE_ADD], - ButtonEnd, + ButtonEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, - LayoutEnd, + LayoutEnd), // GA_ID, GID_TOOLBARLAYOUT, // GA_RelVerify, TRUE, // LAYOUT_RelVerify, TRUE, LAYOUT_WeightBar, TRUE, - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObj, + LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = (ChooserObj, GA_ID, GID_SEARCH_ICON, GA_RelVerify, TRUE, CHOOSER_DropDown, TRUE, CHOOSER_Labels, g->shared->web_search_list, CHOOSER_MaxLabels, 40, /* Same as options GUI */ - ChooserEnd, + ChooserEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = StringObj, + LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = (StringObj, GA_ID,GID_SEARCHSTRING, STRINGA_TextVal, NULL, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_SEARCHSTRING], - StringEnd, - LayoutEnd, + StringEnd), + LayoutEnd), CHILD_WeightedWidth, nsoption_int(web_search_width), - LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = (SpaceObj, GA_ID,GID_THROBBER, SPACE_MinWidth, ami_theme_throbber_get_width(), SPACE_MinHeight, ami_theme_throbber_get_height(), SPACE_Transparent,TRUE, // SPACE_RenderHook, &g->shared->throbber_hook, - SpaceEnd, + SpaceEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddImage, BevelObj, + LAYOUT_AddImage, (BevelObj, BEVEL_Style, BVS_SBAR_VERT, - BevelEnd, + BevelEnd), CHILD_WeightedHeight, 0, - LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = (LayoutVObj, LAYOUT_SpaceInner, FALSE, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = (LayoutHObj, LAYOUT_SpaceInner,FALSE, addtabclosegadget, g->shared->objects[GID_CLOSETAB], CHILD_WeightedWidth,0, @@ -5274,35 +5274,35 @@ gui_window_create(struct browser_window *bw, addtabclosegadget, g->shared->objects[GID_ADDTAB], CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SPACE_RenderHook, &g->shared->browser_hook, - SpaceEnd, - EndGroup, - EndGroup, - EndGroup, + SpaceEnd), + EndGroup), + EndGroup), + EndGroup), // LAYOUT_WeightBar, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = LayoutVObj, - EndGroup, + LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = (LayoutVObj, + EndGroup), CHILD_WeightedHeight, 0, #ifndef __amigaos4__ - LAYOUT_AddChild, g->shared->objects[GID_STATUS] = StringObj, + LAYOUT_AddChild, g->shared->objects[GID_STATUS] = (StringObj, GA_ID, GID_STATUS, GA_ReadOnly, TRUE, STRINGA_TextVal, NULL, GA_RelVerify, TRUE, - StringEnd, + StringEnd), #endif - EndGroup, - EndGroup, - EndWindow; + EndGroup), + EndGroup), + EndWindow); } else { @@ -5311,7 +5311,7 @@ gui_window_create(struct browser_window *bw, g->shared->tabs = 0; g->tab_node = NULL; - g->shared->objects[OID_MAIN] = WindowObj, + g->shared->objects[OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, FALSE, @@ -5338,19 +5338,19 @@ gui_window_create(struct browser_window *bw, WINDOW_SharedPort,sport, WINDOW_UserData,g->shared, WINDOW_BuiltInScroll,TRUE, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutHObj, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutHObj, LAYOUT_DeferLayout, defer_layout, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj, - LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, - SpaceEnd, - EndGroup, - EndGroup, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndGroup), + EndGroup), + EndWindow); } NSLOG(netsurf, INFO, "Opening window"); @@ -6032,14 +6032,14 @@ static nserror gui_search_web_provider_update(const char *provider_name, bm_masking_tag = BITMAP_Masking; } - gwin->search_bm = BitMapObj, + gwin->search_bm = (BitMapObj, BITMAP_Screen, scrn, BITMAP_Width, 16, BITMAP_Height, 16, BITMAP_BitMap, bm, BITMAP_HasAlpha, TRUE, bm_masking_tag, TRUE, - BitMapEnd; + BitMapEnd); RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON], gwin->win, NULL, @@ -6228,7 +6228,7 @@ static Object *ami_gui_splash_open(void) struct TextAttr tattr; struct TextFont *tfont; - win_obj = WindowObj, + win_obj = (WindowObj, #ifdef __amigaos4__ WA_ToolBox, TRUE, #endif @@ -6237,14 +6237,14 @@ static Object *ami_gui_splash_open(void) WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockWidth, TRUE, WINDOW_LockHeight, TRUE, - WINDOW_ParentGroup, LayoutVObj, - LAYOUT_AddImage, bm_obj = BitMapObj, + WINDOW_ParentGroup, (LayoutVObj, + LAYOUT_AddImage, bm_obj = (BitMapObj, BITMAP_SourceFile, "PROGDIR:Resources/splash.png", BITMAP_Screen, wbscreen, BITMAP_Precision, PRECISION_IMAGE, - BitMapEnd, - LayoutEnd, - EndWindow; + BitMapEnd), + LayoutEnd), + EndWindow); if(win_obj == NULL) { NSLOG(netsurf, INFO, "Splash window object not created"); |