From 73827546ef08d1b2357ae7640a3e8c6fd34c63ab Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 13 Feb 2010 18:03:05 +0000 Subject: Fix new warnings. Not sure if I should be declaring all the gadgets as Object *, but that is less casting than declaring them all as struct Gadget * - and allows the merging of object and gadget arrays, which were causing a few problems previously. svn path=/trunk/netsurf/; revision=10039 --- amiga/gui.c | 220 ++++++++++++++++++++---------------- amiga/gui.h | 19 ++-- amiga/gui_options.c | 315 ++++++++++++++++++++++++++-------------------------- 3 files changed, 286 insertions(+), 268 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index b1c23376b..2c4c24c6a 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1007,7 +1007,8 @@ void ami_handle_msg(void) switch(result & WMHI_CLASSMASK) // class { case WMHI_MOUSEMOVE: - GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], + (ULONG *)&bbox); x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->bw->scale); y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->bw->scale); @@ -1059,7 +1060,8 @@ void ami_handle_msg(void) break; case WMHI_MOUSEBUTTONS: - GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], + (ULONG *)&bbox); x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->bw->scale); y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->bw->scale); @@ -1146,7 +1148,9 @@ void ami_handle_msg(void) break; case GID_URL: - GetAttr(STRINGA_TextVal,gwin->gadgets[GID_URL],(ULONG *)&storage); + GetAttr(STRINGA_TextVal, + (Object *)gwin->objects[GID_URL], + (ULONG *)&storage); if(search_is_url((char *)storage) == false) { storage = (ULONG *)search_web_from_term((char *)storage); @@ -1161,7 +1165,9 @@ void ami_handle_msg(void) break; case GID_SEARCHSTRING: - GetAttr(STRINGA_TextVal,gwin->gadgets[GID_SEARCHSTRING],(ULONG *)&storage); + GetAttr(STRINGA_TextVal, + (Object *)gwin->objects[GID_SEARCHSTRING], + (ULONG *)&storage); storage = (ULONG *)search_web_from_term((char *)storage); browser_window_go(gwin->bw,(char *)storage, NULL, true); @@ -1321,7 +1327,7 @@ void ami_handle_msg(void) case 'u': // open url if(option_kiosk_mode == false) - ActivateGadget(gwin->gadgets[GID_URL], + ActivateGadget((struct Gadget *)gwin->objects[GID_URL], gwin->win, NULL); break; } @@ -1331,7 +1337,7 @@ void ami_handle_msg(void) if(!browser_window_key_press(gwin->bw, nskey)) { GetAttr(SPACE_AreaBox, - gwin->gadgets[GID_BROWSER], + (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox); gui_window_get_scroll(gwin->bw->window, @@ -1423,7 +1429,7 @@ void ami_handle_msg(void) ami_update_throbber(gwin,true); // fall through case AMINS_FRAME: - //GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); + //GetAttr(SPACE_AreaBox,gwin->objects[GID_BROWSER],(ULONG *)&bbox); //browser_reformat_pending = true; gwin->bw->reformat_pending = true; //browser_window_reformat(gwin->bw,bbox->Width,bbox->Height); @@ -1530,7 +1536,7 @@ void ami_handle_appmsg(void) while(appmsg=(struct AppMessage *)GetMsg(appport)) { - GetAttr(WINDOW_UserData,(struct Window *)appmsg->am_ID,(ULONG *)&gwin); + GetAttr(WINDOW_UserData, (Object *)appmsg->am_ID, (ULONG *)&gwin); if(appmsg->am_Type == AMTYPE_APPICON) { @@ -1546,7 +1552,8 @@ void ami_handle_appmsg(void) } else if(appmsg->am_Type == AMTYPE_APPWINDOW) { - GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], + (ULONG *)&bbox); ami_get_hscroll_pos(gwin, (ULONG *)&xs); x = (appmsg->am_MouseX) - (bbox->Left) +xs; @@ -1818,7 +1825,7 @@ void ami_change_tab(struct gui_window_2 *gwin, int direction) GetClickTabNodeAttrs(ptab, TNA_Number, (ULONG *)&ptabnum, TAG_DONE); - RefreshSetGadgetAttrs(gwin->gadgets[GID_TABS], gwin->win, NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_TABS], gwin->win, NULL, CLICKTAB_Current, ptabnum, TAG_DONE); @@ -1835,12 +1842,13 @@ void ami_switch_tab(struct gui_window_2 *gwin,bool redraw) gui_window_get_scroll(gwin->bw->window,&gwin->bw->window->scrollx,&gwin->bw->window->scrolly); - GetAttr(CLICKTAB_CurrentNode,gwin->gadgets[GID_TABS],(ULONG *)&tabnode); + GetAttr(CLICKTAB_CurrentNode, (Object *)gwin->objects[GID_TABS], + (ULONG *)&tabnode); GetClickTabNodeAttrs(tabnode, TNA_UserData,&gwin->bw, TAG_DONE); curbw = gwin->bw; - GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox); if(!gwin->bw->current_content) { @@ -2035,25 +2043,25 @@ void ami_update_buttons(struct gui_window_2 *gwin) } } - RefreshSetGadgetAttrs(gwin->gadgets[GID_BACK],gwin->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_BACK],gwin->win,NULL, GA_Disabled,back, TAG_DONE); - RefreshSetGadgetAttrs(gwin->gadgets[GID_FORWARD],gwin->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_FORWARD],gwin->win,NULL, GA_Disabled,forward, TAG_DONE); - RefreshSetGadgetAttrs(gwin->gadgets[GID_RELOAD],gwin->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_RELOAD],gwin->win,NULL, GA_Disabled,reload, TAG_DONE); - RefreshSetGadgetAttrs(gwin->gadgets[GID_STOP],gwin->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_STOP],gwin->win,NULL, GA_Disabled,stop, TAG_DONE); if(gwin->tabs) { - RefreshSetGadgetAttrs(gwin->gadgets[GID_CLOSETAB],gwin->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_CLOSETAB],gwin->win,NULL, GA_Disabled,tabclose, TAG_DONE); } @@ -2127,7 +2135,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, gwin->shared = clone->window->shared; gwin->tab = gwin->shared->next_tab; - SetGadgetAttrs(gwin->shared->gadgets[GID_TABS],gwin->shared->win,NULL, + SetGadgetAttrs((struct Gadget *)gwin->shared->objects[GID_TABS],gwin->shared->win,NULL, CLICKTAB_Labels,~0, TAG_DONE); @@ -2138,19 +2146,19 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, AddTail(&gwin->shared->tab_list,gwin->tab_node); - RefreshSetGadgetAttrs(gwin->shared->gadgets[GID_TABS],gwin->shared->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->shared->objects[GID_TABS],gwin->shared->win,NULL, CLICKTAB_Labels,&gwin->shared->tab_list, TAG_DONE); if(option_new_tab_active) { - RefreshSetGadgetAttrs(gwin->shared->gadgets[GID_TABS],gwin->shared->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)gwin->shared->objects[GID_TABS],gwin->shared->win,NULL, CLICKTAB_Current,gwin->tab, TAG_DONE); } if(ClickTabBase->lib_Version < 53) - RethinkLayout(gwin->shared->gadgets[GID_TABLAYOUT],gwin->shared->win,NULL,TRUE); + RethinkLayout((struct Gadget *)gwin->shared->objects[GID_TABLAYOUT],gwin->shared->win,NULL,TRUE); gwin->shared->tabs++; gwin->shared->next_tab++; @@ -2214,10 +2222,10 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, WINDOW_UserData,gwin->shared, // WINDOW_Position, WPOS_CENTERSCREEN, // WINDOW_CharSet,106, - WINDOW_ParentGroup, gwin->shared->gadgets[GID_MAIN] = VGroupObject, + WINDOW_ParentGroup, gwin->shared->objects[GID_MAIN] = VGroupObject, // LAYOUT_CharSet,106, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, gwin->shared->gadgets[GID_BROWSER] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_BROWSER] = SpaceObject, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, /* @@ -2304,12 +2312,12 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, WINDOW_UserData,gwin->shared, // WINDOW_Position, WPOS_CENTERSCREEN, // WINDOW_CharSet,106, - WINDOW_ParentGroup, gwin->shared->gadgets[GID_MAIN] = VGroupObject, + WINDOW_ParentGroup, gwin->shared->objects[GID_MAIN] = VGroupObject, // LAYOUT_CharSet,106, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, gwin->shared->gadgets[GID_TOOLBARLAYOUT] = HGroupObject, + LAYOUT_AddChild, gwin->shared->objects[GID_TOOLBARLAYOUT] = HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, gwin->shared->gadgets[GID_BACK] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_BACK] = ButtonObject, GA_ID,GID_BACK, GA_RelVerify,TRUE, GA_Disabled,TRUE, @@ -2324,7 +2332,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_FORWARD] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_FORWARD] = ButtonObject, GA_ID,GID_FORWARD, GA_RelVerify,TRUE, GA_Disabled,TRUE, @@ -2339,7 +2347,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_STOP] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_STOP] = ButtonObject, GA_ID,GID_STOP, GA_RelVerify,TRUE, BUTTON_Transparent,TRUE, @@ -2353,7 +2361,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_RELOAD] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_RELOAD] = ButtonObject, GA_ID,GID_RELOAD, GA_RelVerify,TRUE, BUTTON_Transparent,TRUE, @@ -2367,7 +2375,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_HOME] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_HOME] = ButtonObject, GA_ID,GID_HOME, GA_RelVerify,TRUE, BUTTON_Transparent,TRUE, @@ -2381,7 +2389,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_ICON] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_ICON] = SpaceObject, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, @@ -2389,7 +2397,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, SpaceEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_URL] = + LAYOUT_AddChild, gwin->shared->objects[GID_URL] = NewObject(urlStringClass, NULL, STRINGA_MaxChars, 2000, GA_ID, GID_URL, @@ -2411,7 +2419,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, LAYOUT_WeightBar, TRUE, LAYOUT_AddChild, HGroupObject, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, gwin->shared->gadgets[GID_SEARCH_ICON] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_SEARCH_ICON] = SpaceObject, GA_ID, GID_SEARCH_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, @@ -2419,14 +2427,14 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, SpaceEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_SEARCHSTRING] =StringObject, + LAYOUT_AddChild, gwin->shared->objects[GID_SEARCHSTRING] =StringObject, GA_ID,GID_SEARCHSTRING, STRINGA_TextVal, NULL, GA_RelVerify,TRUE, StringEnd, LayoutEnd, CHILD_WeightedWidth, 0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_THROBBER] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_THROBBER] = SpaceObject, GA_ID,GID_THROBBER, SPACE_MinWidth,throbber_width, SPACE_MinHeight,throbber_height, @@ -2436,9 +2444,9 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, CHILD_WeightedHeight,0, LayoutEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_TABLAYOUT] = HGroupObject, + LAYOUT_AddChild, gwin->shared->objects[GID_TABLAYOUT] = HGroupObject, LAYOUT_SpaceInner,FALSE, - LAYOUT_AddChild, gwin->shared->gadgets[GID_CLOSETAB] = ButtonObject, + LAYOUT_AddChild, gwin->shared->objects[GID_CLOSETAB] = ButtonObject, GA_ID,GID_CLOSETAB, GA_RelVerify,TRUE, BUTTON_Transparent,TRUE, @@ -2452,7 +2460,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_TABS] = ClickTabObject, + LAYOUT_AddChild, gwin->shared->objects[GID_TABS] = ClickTabObject, GA_ID,GID_TABS, GA_RelVerify,TRUE, GA_Underscore,13, // disable kb shortcuts @@ -2467,7 +2475,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, CHILD_CacheDomain,FALSE, LayoutEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, gwin->shared->gadgets[GID_BROWSER] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_BROWSER] = SpaceObject, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SpaceEnd, @@ -2510,9 +2518,9 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, WINDOW_SharedPort,sport, WINDOW_UserData,gwin->shared, WINDOW_BuiltInScroll,TRUE, - WINDOW_ParentGroup, gwin->shared->gadgets[GID_MAIN] = VGroupObject, + WINDOW_ParentGroup, gwin->shared->objects[GID_MAIN] = VGroupObject, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, gwin->shared->gadgets[GID_BROWSER] = SpaceObject, + LAYOUT_AddChild, gwin->shared->objects[GID_BROWSER] = SpaceObject, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SpaceEnd, @@ -2535,7 +2543,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GetAttr(WINDOW_VertObject, gwin->shared->objects[OID_MAIN], (ULONG *)&gwin->shared->objects[OID_VSCROLL]); - RefreshSetGadgetAttrs((APTR)gwin->shared->objects[OID_VSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)gwin->shared->objects[OID_VSCROLL], gwin->shared->win, NULL, GA_ID, OID_VSCROLL, ICA_TARGET, ICTARGET_IDCMP, @@ -2549,7 +2557,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, sz = ami_get_border_gadget_balance(gwin->shared, (ULONG *)&size1, (ULONG *)&size2); - gwin->shared->gadgets[GID_HSCROLL] = (struct Gadget *)NewObject( + gwin->shared->objects[GID_HSCROLL] = (struct Gadget *)NewObject( NULL, "scrollergclass", GA_ID, GID_HSCROLL, @@ -2563,10 +2571,10 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GA_DrawInfo, dri, TAG_DONE); - GetAttr(GA_Height, gwin->shared->gadgets[GID_HSCROLL], + GetAttr(GA_Height, (Object *)gwin->shared->objects[GID_HSCROLL], (ULONG *)&sz); - gwin->shared->gadgets[GID_STATUS] = (struct Gadget *)NewObject( + gwin->shared->objects[GID_STATUS] = (struct Gadget *)NewObject( NULL, "frbuttonclass", GA_ID, GID_STATUS, @@ -2585,20 +2593,20 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, IA_Height, scrn->WBorBottom + scrn->RastPort.TxHeight, IA_InBorder, TRUE, TAG_DONE), - GA_Next, gwin->shared->gadgets[GID_HSCROLL], + GA_Next, gwin->shared->objects[GID_HSCROLL], TAG_DONE); - AddGList(gwin->shared->win, gwin->shared->gadgets[GID_STATUS], + AddGList(gwin->shared->win, (struct Gadget *)gwin->shared->objects[GID_STATUS], (UWORD)~0, -1, NULL); /* Apparently you can't set GA_Width on creation time for frbuttonclass */ - SetGadgetAttrs(gwin->shared->gadgets[GID_STATUS], + SetGadgetAttrs((struct Gadget *)gwin->shared->objects[GID_STATUS], gwin->shared->win, NULL, GA_Width, size1, TAG_DONE); - RefreshGadgets((APTR)gwin->shared->gadgets[GID_STATUS], + RefreshGadgets((APTR)gwin->shared->objects[GID_STATUS], gwin->shared->win, NULL); } else @@ -2606,7 +2614,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, GetAttr(WINDOW_HorizObject, gwin->shared->objects[OID_MAIN], (ULONG *)&gwin->shared->objects[OID_HSCROLL]); - RefreshSetGadgetAttrs((APTR)gwin->shared->objects[OID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)gwin->shared->objects[OID_HSCROLL], gwin->shared->win, NULL, GA_ID, OID_HSCROLL, ICA_TARGET, ICTARGET_IDCMP, @@ -2636,19 +2644,19 @@ ULONG ami_set_border_gadget_balance(struct gui_window_2 *gwin) sz = ami_get_border_gadget_balance(gwin, &size1, &size2); - RefreshSetGadgetAttrs((APTR)gwin->gadgets[GID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)gwin->objects[GID_HSCROLL], gwin->win, NULL, // GA_Left, size1, GA_RelRight, - size2 - sz, GA_Width, size2, TAG_DONE); - RefreshSetGadgetAttrs((APTR)gwin->gadgets[GID_STATUS], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)gwin->objects[GID_STATUS], gwin->win, NULL, GA_Width, size1, TAG_DONE); - RefreshGList(gwin->gadgets[GID_STATUS], gwin->win, NULL, 2); + RefreshGList((struct Gadget *)gwin->objects[GID_STATUS], gwin->win, NULL, 2); } ULONG ami_get_border_gadget_balance(struct gui_window_2 *gwin, ULONG *size1, ULONG *size2) @@ -2721,7 +2729,7 @@ void gui_window_destroy(struct gui_window *g) if(g->shared->tabs > 1) { - SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL, + SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],g->shared->win,NULL, CLICKTAB_Labels,~0, TAG_DONE); @@ -2731,13 +2739,13 @@ void gui_window_destroy(struct gui_window *g) GetClickTabNodeAttrs(ptab,TNA_Number,(ULONG *)&ptabnum,TAG_DONE); Remove(g->tab_node); FreeClickTabNode(g->tab_node); - RefreshSetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],g->shared->win,NULL, CLICKTAB_Labels,&g->shared->tab_list, CLICKTAB_Current,ptabnum, TAG_DONE); if(ClickTabBase->lib_Version < 53) - RethinkLayout(g->shared->gadgets[GID_TABLAYOUT],g->shared->win,NULL,TRUE); + RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT],g->shared->win,NULL,TRUE); g->shared->tabs--; ami_switch_tab(g->shared,true); @@ -2784,20 +2792,23 @@ void gui_window_set_title(struct gui_window *g, const char *title) { node = g->tab_node; - SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL, + SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS],g->shared->win,NULL, CLICKTAB_Labels,~0, TAG_DONE); SetClickTabNodeAttrs(node, TNA_Text, utf8title, TAG_DONE); - RefreshSetGadgetAttrs(g->shared->gadgets[GID_TABS], g->shared->win, NULL, + RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_TABS], + g->shared->win, NULL, CLICKTAB_Labels, &g->shared->tab_list, TAG_DONE); if(ClickTabBase->lib_Version < 53) - RethinkLayout(g->shared->gadgets[GID_TABLAYOUT],g->shared->win,NULL,TRUE); + RethinkLayout((struct Gadget *)g->shared->objects[GID_TABLAYOUT], + g->shared->win, NULL, TRUE); } - GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + GetAttr(CLICKTAB_Current, g->shared->objects[GID_TABS], + (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) { @@ -2832,14 +2843,15 @@ void ami_do_redraw_limits(struct gui_window *g, struct content *c,int x0, int y0 if(!g) return; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if(!((cur_tab == g->tab) || (g->shared->tabs == 0))) { return; } - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox); if(!c) return; if (c->locked) return; @@ -2917,7 +2929,8 @@ void gui_window_redraw_window(struct gui_window *g) if(!g) return; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) g->shared->redraw_required = true; @@ -2950,7 +2963,7 @@ void ami_do_redraw(struct gui_window_2 *g) ULONG oldh=g->oldh,oldv=g->oldv; bool morescroll = false; - GetAttr(SPACE_AreaBox,g->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)g->objects[GID_BROWSER], (ULONG *)&bbox); ami_get_hscroll_pos(g, (ULONG *)&hcurrent); ami_get_vscroll_pos(g, (ULONG *)&vcurrent); @@ -3068,9 +3081,9 @@ void ami_do_redraw(struct gui_window_2 *g) void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs) { - if(gwin->gadgets[GID_HSCROLL]) + if(gwin->objects[GID_HSCROLL]) { - GetAttr(PGA_Top, gwin->gadgets[GID_HSCROLL], xs); + GetAttr(PGA_Top, (Object *)gwin->objects[GID_HSCROLL], xs); } else if(gwin->objects[OID_HSCROLL]) { @@ -3103,25 +3116,26 @@ void gui_window_set_scroll(struct gui_window *g, int sx, int sy) if(sx > g->shared->bw->current_content->width) sx = g->shared->bw->current_content->width; if(sy > g->shared->bw->current_content->height) sy = g->shared->bw->current_content->height; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - RefreshSetGadgetAttrs((APTR)g->shared->objects[OID_VSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[OID_VSCROLL], g->shared->win, NULL, SCROLLER_Top, (ULONG)(sy * g->shared->bw->scale), TAG_DONE); - if(g->shared->gadgets[GID_HSCROLL]) + if(g->shared->objects[GID_HSCROLL]) { - RefreshSetGadgetAttrs((APTR)g->shared->gadgets[GID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[GID_HSCROLL], g->shared->win, NULL, PGA_Top, (ULONG)(sx * g->shared->bw->scale), TAG_DONE); } else if(g->shared->objects[OID_HSCROLL]) { - RefreshSetGadgetAttrs((APTR)g->shared->objects[OID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[OID_HSCROLL], g->shared->win, NULL, SCROLLER_Top, (ULONG)(sx * g->shared->bw->scale), TAG_DONE); @@ -3159,7 +3173,7 @@ void gui_window_get_dimensions(struct gui_window *g, int *width, int *height, struct IBox *bbox; if(!g) return; - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox); *width = bbox->Width; *height = bbox->Height; @@ -3179,20 +3193,22 @@ void gui_window_update_extent(struct gui_window *g) if(!g) return; if(!g->shared->bw->current_content) return; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], + (ULONG *)&bbox); - RefreshSetGadgetAttrs((APTR)g->shared->objects[OID_VSCROLL],g->shared->win,NULL, + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[OID_VSCROLL],g->shared->win,NULL, SCROLLER_Total, (ULONG)(g->shared->bw->current_content->height * g->shared->bw->scale), SCROLLER_Visible, bbox->Height, TAG_DONE); - if(g->shared->gadgets[GID_HSCROLL]) + if(g->shared->objects[GID_HSCROLL]) { - RefreshSetGadgetAttrs((APTR)g->shared->gadgets[GID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[GID_HSCROLL], g->shared->win, NULL, PGA_Total, (ULONG)(g->shared->bw->current_content->width * g->shared->bw->scale), PGA_Visible, bbox->Width, @@ -3200,7 +3216,7 @@ void gui_window_update_extent(struct gui_window *g) } else if(g->shared->objects[OID_HSCROLL]) { - RefreshSetGadgetAttrs((APTR)g->shared->objects[OID_HSCROLL], + RefreshSetGadgetAttrs((struct Gadget *)(APTR)g->shared->objects[OID_HSCROLL], g->shared->win, NULL, SCROLLER_Total, (ULONG)(g->shared->bw->current_content->width * g->shared->bw->scale), SCROLLER_Visible, bbox->Width, @@ -3221,27 +3237,29 @@ void gui_window_set_status(struct gui_window *g, const char *text) if(!g) return; if(!text) return; - if(!g->shared->gadgets[GID_STATUS]) return; + if(!g->shared->objects[GID_STATUS]) return; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) { utf8text = ami_utf8_easy((char *)text); if(utf8text == NULL) return; - GetAttr(GA_Width, g->shared->gadgets[GID_STATUS],(ULONG *)&size); + GetAttr(GA_Width, g->shared->objects[GID_STATUS], (ULONG *)&size); chars = TextFit(&scrn->RastPort, utf8text, strlen(utf8text), &textex, NULL, 1, size - 2, scrn->RastPort.TxHeight); utf8text[chars] = 0; - SetGadgetAttrs(g->shared->gadgets[GID_STATUS], + SetGadgetAttrs((struct Gadget *)g->shared->objects[GID_STATUS], g->shared->win, NULL, GA_Text, utf8text, TAG_DONE); - RefreshGList(g->shared->gadgets[GID_STATUS],g->shared->win,NULL,1); + RefreshGList((struct Gadget *)g->shared->objects[GID_STATUS], + g->shared->win, NULL, 1); if(g->shared->status) ami_utf8_free(g->shared->status); g->shared->status = utf8text; @@ -3440,11 +3458,13 @@ void gui_window_set_url(struct gui_window *g, const char *url) if(!g) return; if(!url) return; - if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - RefreshSetGadgetAttrs(g->shared->gadgets[GID_URL],g->shared->win,NULL,STRINGA_TextVal,url,TAG_DONE); + RefreshSetGadgetAttrs((struct Gadget *)g->shared->objects[GID_URL], + g->shared->win, NULL, STRINGA_TextVal, url, TAG_DONE); } } @@ -3457,9 +3477,10 @@ void gui_window_start_throbber(struct gui_window *g) if(g->tab_node) { - GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab); + GetAttr(CLICKTAB_Current, g->shared->objects[GID_TABS], + (ULONG *)&cur_tab); SetClickTabNodeAttrs(g->tab_node, TNA_Flagged, TRUE, TAG_DONE); - RefreshGadgets((APTR)g->shared->gadgets[GID_TABS], + RefreshGadgets((APTR)g->shared->objects[GID_TABS], g->shared->win, NULL); } @@ -3467,7 +3488,8 @@ void gui_window_start_throbber(struct gui_window *g) if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_THROBBER], + (ULONG *)&bbox); if(g->shared->throbber_frame == 0) g->shared->throbber_frame=1; @@ -3484,10 +3506,10 @@ void gui_window_stop_throbber(struct gui_window *g) if(g->tab_node) { - GetAttr(CLICKTAB_Current, g->shared->gadgets[GID_TABS], + GetAttr(CLICKTAB_Current, g->shared->objects[GID_TABS], (ULONG *)&cur_tab); SetClickTabNodeAttrs(g->tab_node, TNA_Flagged, FALSE, TAG_DONE); - RefreshGadgets((APTR)g->shared->gadgets[GID_TABS], + RefreshGadgets((APTR)g->shared->objects[GID_TABS], g->shared->win, NULL); } @@ -3495,7 +3517,8 @@ void gui_window_stop_throbber(struct gui_window *g) if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_THROBBER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_THROBBER], + (ULONG *)&bbox); BltBitMapRastPort(throbber, 0, 0, g->shared->win->RPort, bbox->Left, bbox->Top, throbber_width, throbber_height, 0x0C0); @@ -3515,7 +3538,8 @@ void gui_window_set_icon(struct gui_window *g, struct content *icon) if(option_kiosk_mode == true) return; if(!g) return; - if(g->tab_node) GetAttr(CLICKTAB_Current, g->shared->gadgets[GID_TABS], + if(g->tab_node) GetAttr(CLICKTAB_Current, + g->shared->objects[GID_TABS], (ULONG *)&cur_tab); if ((icon != NULL) && @@ -3535,7 +3559,7 @@ void gui_window_set_icon(struct gui_window *g, struct content *icon) if((cur_tab == g->tab) || (g->shared->tabs == 0)) { - GetAttr(SPACE_AreaBox, g->shared->gadgets[GID_ICON], (ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_ICON], (ULONG *)&bbox); EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top, bbox->Left+16, bbox->Top+16); @@ -3597,7 +3621,7 @@ void gui_window_set_search_ico(struct content *ico) if(node->Type == AMINS_WINDOW) { - GetAttr(SPACE_AreaBox, gwin->gadgets[GID_SEARCH_ICON], (ULONG *)&bbox); + GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_SEARCH_ICON], (ULONG *)&bbox); EraseRect(gwin->win->RPort, bbox->Left, bbox->Top, bbox->Left+16, bbox->Top+16); @@ -3627,7 +3651,7 @@ void ami_update_throbber(struct gui_window_2 *g,bool redraw) int frame = g->throbber_frame; if(!g) return; - if(!g->gadgets[GID_THROBBER]) return; + if(!g->objects[GID_THROBBER]) return; if(g->bw->window->throbbing == false) { @@ -3653,7 +3677,7 @@ void ami_update_throbber(struct gui_window_2 *g,bool redraw) } } - GetAttr(SPACE_AreaBox,g->gadgets[GID_THROBBER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox,(Object *)g->objects[GID_THROBBER],(ULONG *)&bbox); /* EraseRect(g->win->RPort,bbox->Left,bbox->Top, @@ -3683,7 +3707,7 @@ void gui_window_place_caret(struct gui_window *g, int x, int y, int height) gui_window_remove_caret(g); - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox,g->shared->objects[GID_BROWSER],(ULONG *)&bbox); ami_get_hscroll_pos(g->shared, (ULONG *)&xs); ami_get_vscroll_pos(g->shared, (ULONG *)&ys); @@ -3711,7 +3735,7 @@ void gui_window_remove_caret(struct gui_window *g) if(!g) return; - GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox); + GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox); ami_get_hscroll_pos(g->shared, (ULONG *)&xs); ami_get_vscroll_pos(g->shared, (ULONG *)&ys); diff --git a/amiga/gui.h b/amiga/gui.h index b1f512e08..466b3c4f0 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -28,7 +28,12 @@ enum { - GID_MAIN=0, + OID_MAIN = 0, + OID_VSCROLL, + OID_HSCROLL, + OID_MENU, + OID_LAST, /* for compatibility */ + GID_MAIN, GID_TABLAYOUT, GID_BROWSER, GID_STATUS, @@ -62,16 +67,7 @@ enum GID_CASE, GID_TOOLBARLAYOUT, GID_HSCROLL, - GID_LAST -}; - -enum -{ - OID_MAIN=0, - OID_VSCROLL, - OID_HSCROLL, - OID_MENU, - OID_LAST + GID_LAST }; #define AMI_GUI_POINTER_BLANK GUI_POINTER_PROGRESS+1 @@ -84,7 +80,6 @@ struct history_window; struct gui_window_2 { struct Window *win; Object *objects[OID_LAST]; - struct Gadget *gadgets[GID_LAST]; struct nsObject *node; struct browser_window *bw; bool redraw_required; diff --git a/amiga/gui_options.c b/amiga/gui_options.c index ee605f672..c365e7fd9 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -64,7 +64,7 @@ enum { - GID_OPTS_MAIN=0, + GID_OPTS_MAIN = GID_MAIN, GID_OPTS_HOMEPAGE, GID_OPTS_HOMEPAGE_DEFAULT, GID_OPTS_HOMEPAGE_CURRENT, @@ -182,8 +182,7 @@ enum struct ami_gui_opts_window { struct Window *win; - Object *objects[OID_LAST]; - struct Gadget *gadgets[GID_OPTS_LAST]; + Object *objects[GID_OPTS_LAST]; struct nsObject *node; ULONG pad[6]; }; @@ -475,7 +474,7 @@ void ami_gui_opts_open(void) WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, WA_IDCMP,IDCMP_GADGETUP, - WINDOW_ParentGroup, gow->gadgets[GID_OPTS_MAIN] = VGroupObject, + WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = VGroupObject, LAYOUT_AddChild, ClickTabObject, GA_RelVerify, TRUE, GA_Text, tabs, @@ -489,7 +488,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_HOMEPAGE], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_HOMEPAGE] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = StringObject, GA_ID, GID_OPTS_HOMEPAGE, GA_RelVerify, TRUE, STRINGA_TextVal, option_homepage_url, @@ -499,12 +498,12 @@ void ami_gui_opts_open(void) LABEL_Text, gadlab[GID_OPTS_HOMEPAGE], LabelEnd, LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObject, GA_ID,GID_OPTS_HOMEPAGE_DEFAULT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_DEFAULT], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObject, GA_ID,GID_OPTS_HOMEPAGE_CURRENT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_CURRENT], GA_RelVerify,TRUE, @@ -517,7 +516,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTBLOCKING], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_HIDEADS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = CheckBoxObject, GA_ID, GID_OPTS_HIDEADS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_HIDEADS], @@ -528,13 +527,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTLANGUAGE], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CONTENTLANG] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObject, GA_ID, GID_OPTS_CONTENTLANG, GA_RelVerify, TRUE, STRINGA_TextVal, option_accept_language, STRINGA_BufferPos,0, StringEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FROMLOCALE] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = ButtonObject, GA_ID,GID_OPTS_FROMLOCALE, GA_Text,gadlab[GID_OPTS_FROMLOCALE], GA_RelVerify,TRUE, @@ -548,7 +547,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_HISTORY], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_HISTORY] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObject, GA_ID, GID_OPTS_CACHE_DISC, GA_RelVerify, TRUE, INTEGER_Number, option_expire_url, @@ -571,13 +570,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_REFERRAL] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObject, GA_ID, GID_OPTS_REFERRAL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_REFERRAL], GA_Selected, option_send_referer, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FASTSCROLL] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObject, GA_ID, GID_OPTS_FASTSCROLL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FASTSCROLL], @@ -598,7 +597,7 @@ void ami_gui_opts_open(void) LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCREEN], LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SCREEN] = RadioButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObject, GA_ID, GID_OPTS_SCREEN, GA_RelVerify, TRUE, GA_Text, screenopts, @@ -606,7 +605,7 @@ void ami_gui_opts_open(void) RadioButtonEnd, CHILD_WeightedWidth,0, LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SCREENMODE] = GetScreenModeObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObject, GA_ID, GID_OPTS_SCREENMODE, GA_RelVerify, TRUE, GA_Disabled,screenmodedisabled, @@ -614,7 +613,7 @@ void ami_gui_opts_open(void) GETSCREENMODE_MinDepth, 16, GETSCREENMODE_MaxDepth, 32, GetScreenModeEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SCREENNAME] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObject, GA_ID, GID_OPTS_SCREENNAME, GA_RelVerify, TRUE, GA_Disabled,screennamedisabled, @@ -630,7 +629,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_THEME], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_THEME] = GetFileObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObject, GA_ID, GID_OPTS_THEME, GA_RelVerify, TRUE, GETFILE_Drawer, option_theme, @@ -644,13 +643,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MOUSE], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PTRTRUE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObject, GA_ID, GID_OPTS_PTRTRUE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTRTRUE], GA_Selected, option_truecolour_mouse_pointers, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PTROS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObject, GA_ID, GID_OPTS_PTROS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTROS], @@ -673,7 +672,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_PROXY], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PROXY] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = ChooserObject, GA_ID, GID_OPTS_PROXY, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -684,14 +683,14 @@ void ami_gui_opts_open(void) LABEL_Text, gadlab[GID_OPTS_PROXY], LabelEnd, LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PROXY_HOST] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObject, GA_ID, GID_OPTS_PROXY_HOST, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, STRINGA_TextVal, option_http_proxy_host, STRINGA_BufferPos,0, StringEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PROXY_PORT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = IntegerObject, GA_ID, GID_OPTS_PROXY_PORT, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, @@ -709,7 +708,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_PROXY_HOST], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PROXY_USER] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObject, GA_ID, GID_OPTS_PROXY_USER, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, @@ -719,7 +718,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_PROXY_USER], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_PROXY_PASS] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObject, GA_ID, GID_OPTS_PROXY_PASS, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, @@ -735,7 +734,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FETCHING], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FETCHMAX] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObject, GA_ID, GID_OPTS_FETCHMAX, GA_RelVerify, TRUE, INTEGER_Number, option_max_fetchers, @@ -747,7 +746,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FETCHMAX], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FETCHHOST] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObject, GA_ID, GID_OPTS_FETCHHOST, GA_RelVerify, TRUE, INTEGER_Number, option_max_fetchers_per_host, @@ -759,7 +758,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FETCHHOST], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FETCHCACHE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObject, GA_ID, GID_OPTS_FETCHCACHE, GA_RelVerify, TRUE, INTEGER_Number, option_max_cached_fetch_handles, @@ -785,7 +784,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_IMAGES], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_NATIVEBM] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObject, GA_ID, GID_OPTS_NATIVEBM, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -795,7 +794,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_NATIVEBM], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SCALEQ] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObject, GA_ID, GID_OPTS_SCALEQ, GA_Disabled, scaledisabled, GA_RelVerify, TRUE, @@ -810,7 +809,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_ANIMS], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_ANIMSPEED] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObject, GA_ID, GID_OPTS_ANIMSPEED, GA_RelVerify, TRUE, GA_Disabled, animspeeddisabled, @@ -826,7 +825,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_ANIMSPEED], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_ANIMDISABLE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObject, GA_ID, GID_OPTS_ANIMDISABLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_ANIMDISABLE], @@ -846,7 +845,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FONTFACES], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_SANS] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = GetFontObject, GA_ID, GID_OPTS_FONT_SANS, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontsans, @@ -855,7 +854,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_SANS], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_SERIF] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObject, GA_ID, GID_OPTS_FONT_SERIF, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontserif, @@ -864,7 +863,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_SERIF], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_MONO] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObject, GA_ID, GID_OPTS_FONT_MONO, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontmono, @@ -874,7 +873,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_MONO], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_CURSIVE] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObject, GA_ID, GID_OPTS_FONT_CURSIVE, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontcursive, @@ -883,7 +882,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_CURSIVE], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_FANTASY] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObject, GA_ID, GID_OPTS_FONT_FANTASY, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontfantasy, @@ -892,7 +891,7 @@ void ami_gui_opts_open(void) CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY], LabelEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_DEFAULT] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObject, GA_ID, GID_OPTS_FONT_DEFAULT, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -910,7 +909,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_SIZE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject, GA_ID, GID_OPTS_FONT_SIZE, GA_RelVerify, TRUE, INTEGER_Number, option_font_size / 10, @@ -928,7 +927,7 @@ void ami_gui_opts_open(void) LabelEnd, LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_FONT_MINSIZE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject, GA_ID, GID_OPTS_FONT_MINSIZE, GA_RelVerify, TRUE, INTEGER_Number, option_font_min_size / 10, @@ -960,7 +959,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_MEMCACHE], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CACHE_MEM] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObject, GA_ID, GID_OPTS_CACHE_MEM, GA_RelVerify, TRUE, INTEGER_Number, option_memory_cache_size / 1048576, @@ -984,7 +983,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_DISCCACHE], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CACHE_DISC] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObject, GA_ID, GID_OPTS_CACHE_DISC, GA_RelVerify, TRUE, GA_Disabled, TRUE, @@ -1016,14 +1015,14 @@ void ami_gui_opts_open(void) LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DOWNLOADS], LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_OVERWRITE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObject, GA_ID, GID_OPTS_CLIPBOARD, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_Text, gadlab[GID_OPTS_OVERWRITE], GA_Selected, FALSE, //option_ask_overwrite, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_NOTIFY] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObject, GA_ID, GID_OPTS_NOTIFY, GA_RelVerify, TRUE, GA_Disabled, download_notify_disabled, @@ -1031,7 +1030,7 @@ void ami_gui_opts_open(void) GA_Selected, option_download_notify, CheckBoxEnd, LayoutEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_DLDIR] = GetFileObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObject, GA_ID, GID_OPTS_DLDIR, GA_RelVerify, TRUE, GETFILE_Drawer, option_download_dir, @@ -1049,13 +1048,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_TABS], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_TAB_ACTIVE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = CheckBoxObject, GA_ID, GID_OPTS_TAB_ACTIVE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ACTIVE], GA_Selected, !option_new_tab_active, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_TAB_2] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = CheckBoxObject, GA_ID, GID_OPTS_TAB_2, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_2], @@ -1066,13 +1065,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTEXTMENU], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CMENU_ENABLE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CMENU_ENABLE] = CheckBoxObject, GA_ID, GID_OPTS_CMENU_ENABLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CMENU_ENABLE], GA_Selected, option_context_menu, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CMENU_STICKY] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CMENU_STICKY] = CheckBoxObject, GA_ID, GID_OPTS_CMENU_STICKY, GA_RelVerify, TRUE, GA_Disabled, !option_context_menu, @@ -1086,13 +1085,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SEARCH], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SEARCH_URLBAR] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_URLBAR] = CheckBoxObject, GA_ID, GID_OPTS_SEARCH_URLBAR, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_SEARCH_URLBAR], GA_Selected, option_search_url_bar, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SEARCH_PROV] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObject, GA_ID, GID_OPTS_SEARCH_PROV, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -1109,7 +1108,7 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CLIPBOARD] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObject, GA_ID, GID_OPTS_CLIPBOARD, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLIPBOARD], @@ -1122,20 +1121,20 @@ void ami_gui_opts_open(void) LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_BEHAVIOUR], LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObject, GA_ID, GID_OPTS_STARTUP_NO_WIN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_STARTUP_NO_WIN], GA_Selected, option_startup_no_window, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObject, GA_ID, GID_OPTS_CLOSE_NO_QUIT, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLOSE_NO_QUIT], GA_Selected, option_close_no_quit, CheckBoxEnd, LayoutEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_DOCKY] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObject, GA_ID, GID_OPTS_DOCKY, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_DOCKY], @@ -1157,7 +1156,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_MARGINS], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_MARGIN_TOP] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObject, GA_ID, GID_OPTS_MARGIN_TOP, GA_RelVerify, TRUE, INTEGER_Number, option_margin_top, @@ -1175,7 +1174,7 @@ void ami_gui_opts_open(void) LabelEnd, LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_MARGIN_LEFT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObject, GA_ID, GID_OPTS_MARGIN_LEFT, GA_RelVerify, TRUE, INTEGER_Number, option_margin_left, @@ -1193,7 +1192,7 @@ void ami_gui_opts_open(void) LabelEnd, LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_MARGIN_BOTTOM] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObject, GA_ID, GID_OPTS_MARGIN_BOTTOM, GA_RelVerify, TRUE, INTEGER_Number, option_margin_bottom, @@ -1211,7 +1210,7 @@ void ami_gui_opts_open(void) LabelEnd, LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_MARGIN_RIGHT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObject, GA_ID, GID_OPTS_MARGIN_RIGHT, GA_RelVerify, TRUE, INTEGER_Number, option_margin_right, @@ -1235,7 +1234,7 @@ void ami_gui_opts_open(void) LAYOUT_Label, gadlab[GRP_OPTS_SCALING], LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_SCALE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObject, GA_ID, GID_OPTS_EXPORT_SCALE, GA_RelVerify, TRUE, INTEGER_Number, option_export_scale, @@ -1257,19 +1256,19 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_APPEARANCE], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObject, GA_ID, GID_OPTS_EXPORT_NOIMAGES, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOIMAGES], GA_Selected, option_suppress_images, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_NOBKG] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = CheckBoxObject, GA_ID, GID_OPTS_EXPORT_NOBKG, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOBKG], GA_Selected, option_remove_backgrounds, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObject, GA_ID, GID_OPTS_EXPORT_LOOSEN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_LOOSEN], @@ -1281,13 +1280,13 @@ void ami_gui_opts_open(void) LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_ADVANCED], - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObject, GA_ID, GID_OPTS_EXPORT_COMPRESS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_COMPRESS], GA_Selected, option_enable_PDF_compression, CheckBoxEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObject, GA_ID, GID_OPTS_EXPORT_PASSWORD, GA_RelVerify, TRUE, GA_Disabled, TRUE, @@ -1302,17 +1301,17 @@ void ami_gui_opts_open(void) End, // pagegroup ClickTabEnd, LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_SAVE] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObject, GA_ID,GID_OPTS_SAVE, GA_Text,gadlab[GID_OPTS_SAVE], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_USE] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = ButtonObject, GA_ID,GID_OPTS_USE, GA_Text,gadlab[GID_OPTS_USE], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->gadgets[GID_OPTS_CANCEL] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = ButtonObject, GA_ID,GID_OPTS_CANCEL, GA_Text,gadlab[GID_OPTS_CANCEL], GA_RelVerify,TRUE, @@ -1334,29 +1333,29 @@ void ami_gui_opts_use(void) struct TextAttr *tattr; char *dot; - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_HOMEPAGE],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_HOMEPAGE],(ULONG *)&data); if(option_homepage_url) free(option_homepage_url); option_homepage_url = (char *)strdup((char *)data); - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_CONTENTLANG],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_CONTENTLANG],(ULONG *)&data); if(option_accept_language) free(option_accept_language); option_accept_language = (char *)strdup((char *)data); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_HIDEADS],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_HIDEADS],(ULONG *)&data); if(data) option_block_ads = true; else option_block_ads = false; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_HISTORY],(ULONG *)&option_expire_url); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_HISTORY],(ULONG *)&option_expire_url); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_REFERRAL],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_REFERRAL],(ULONG *)&data); if(data) option_send_referer = true; else option_send_referer = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_FASTSCROLL],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_FASTSCROLL],(ULONG *)&data); if(data) option_faster_scroll = true; else option_faster_scroll = false; - GetAttr(RADIOBUTTON_Selected,gow->gadgets[GID_OPTS_SCREEN],(ULONG *)&data); + GetAttr(RADIOBUTTON_Selected,gow->objects[GID_OPTS_SCREEN],(ULONG *)&data); switch(data) { case 0: @@ -1370,13 +1369,13 @@ void ami_gui_opts_use(void) break; case 2: - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_SCREENNAME],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_SCREENNAME],(ULONG *)&data); if(option_use_pubscreen) free(option_use_pubscreen); option_use_pubscreen = (char *)strdup((char *)data); break; } - GetAttr(GETSCREENMODE_DisplayID,gow->gadgets[GID_OPTS_SCREENMODE],(ULONG *)&data); + GetAttr(GETSCREENMODE_DisplayID,gow->objects[GID_OPTS_SCREENMODE],(ULONG *)&data); if(data) { if(option_modeid) free(option_modeid); @@ -1384,19 +1383,19 @@ void ami_gui_opts_use(void) sprintf(option_modeid,"0x%lx",data); } - GetAttr(GETFILE_Drawer,gow->gadgets[GID_OPTS_THEME],(ULONG *)&data); + GetAttr(GETFILE_Drawer,gow->objects[GID_OPTS_THEME],(ULONG *)&data); if(option_theme) free(option_theme); option_theme = (char *)strdup((char *)data); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_PTRTRUE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_PTRTRUE],(ULONG *)&data); if(data) option_truecolour_mouse_pointers = true; else option_truecolour_mouse_pointers = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_PTROS],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_PTROS],(ULONG *)&data); if(data) option_use_os_pointers = true; else option_use_os_pointers = false; - GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_PROXY],(ULONG *)&data); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_PROXY],(ULONG *)&data); if(data) { option_http_proxy = true; @@ -1407,161 +1406,161 @@ void ami_gui_opts_use(void) option_http_proxy = false; } - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_PROXY_HOST],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_PROXY_HOST],(ULONG *)&data); if(option_http_proxy_host) free(option_http_proxy_host); option_http_proxy_host = (char *)strdup((char *)data); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_PROXY_PORT],(ULONG *)&option_http_proxy_port); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_PROXY_PORT],(ULONG *)&option_http_proxy_port); - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_PROXY_USER],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_PROXY_USER],(ULONG *)&data); if(option_http_proxy_auth_user) free(option_http_proxy_auth_user); option_http_proxy_auth_user = (char *)strdup((char *)data); - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_PROXY_PASS],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_PROXY_PASS],(ULONG *)&data); if(option_http_proxy_auth_pass) free(option_http_proxy_auth_pass); option_http_proxy_auth_pass = (char *)strdup((char *)data); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHMAX],(ULONG *)&option_max_fetchers); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHHOST],(ULONG *)&option_max_fetchers_per_host); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FETCHCACHE],(ULONG *)&option_max_cached_fetch_handles); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHMAX],(ULONG *)&option_max_fetchers); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHHOST],(ULONG *)&option_max_fetchers_per_host); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FETCHCACHE],(ULONG *)&option_max_cached_fetch_handles); - GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_NATIVEBM],(ULONG *)&option_cache_bitmaps); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_NATIVEBM],(ULONG *)&option_cache_bitmaps); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_SCALEQ],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_SCALEQ],(ULONG *)&data); if(data) option_scale_quality = true; else option_scale_quality = false; - GetAttr(STRINGA_TextVal,gow->gadgets[GID_OPTS_ANIMSPEED],(ULONG *)&data); + GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG *)&data); animspeed = strtof((char *)data,NULL); option_minimum_gif_delay = (int)(animspeed * 100); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_ANIMDISABLE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_ANIMDISABLE],(ULONG *)&data); if(data) option_animate_images = false; else option_animate_images = true; - GetAttr(GETFONT_TextAttr,gow->gadgets[GID_OPTS_FONT_SANS],(ULONG *)&data); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_SANS],(ULONG *)&data); tattr = (struct TextAttr *)data; if(option_font_sans) free(option_font_sans); if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_sans = (char *)strdup((char *)tattr->ta_Name); - GetAttr(GETFONT_TextAttr,gow->gadgets[GID_OPTS_FONT_SERIF],(ULONG *)&data); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_SERIF],(ULONG *)&data); tattr = (struct TextAttr *)data; if(option_font_serif) free(option_font_serif); if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_serif = (char *)strdup((char *)tattr->ta_Name); - GetAttr(GETFONT_TextAttr,gow->gadgets[GID_OPTS_FONT_MONO],(ULONG *)&data); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_MONO],(ULONG *)&data); tattr = (struct TextAttr *)data; if(option_font_mono) free(option_font_mono); if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_mono = (char *)strdup((char *)tattr->ta_Name); - GetAttr(GETFONT_TextAttr,gow->gadgets[GID_OPTS_FONT_CURSIVE],(ULONG *)&data); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_CURSIVE],(ULONG *)&data); tattr = (struct TextAttr *)data; if(option_font_cursive) free(option_font_cursive); if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_cursive = (char *)strdup((char *)tattr->ta_Name); - GetAttr(GETFONT_TextAttr,gow->gadgets[GID_OPTS_FONT_FANTASY],(ULONG *)&data); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_FANTASY],(ULONG *)&data); tattr = (struct TextAttr *)data; if(option_font_fantasy) free(option_font_fantasy); if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_fantasy = (char *)strdup((char *)tattr->ta_Name); - GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_FONT_DEFAULT],(ULONG *)&option_font_default); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_FONT_DEFAULT],(ULONG *)&option_font_default); option_font_default += PLOT_FONT_FAMILY_SANS_SERIF; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FONT_SIZE],(ULONG *)&option_font_size); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FONT_SIZE],(ULONG *)&option_font_size); option_font_size *= 10; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_FONT_MINSIZE],(ULONG *)&option_font_min_size); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FONT_MINSIZE],(ULONG *)&option_font_min_size); option_font_min_size *= 10; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_CACHE_MEM],(ULONG *)&option_memory_cache_size); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_CACHE_MEM],(ULONG *)&option_memory_cache_size); option_memory_cache_size *= 1048576; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_CACHE_DISC],(ULONG *)&option_disc_cache_age); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_CACHE_DISC],(ULONG *)&option_disc_cache_age); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_OVERWRITE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_OVERWRITE],(ULONG *)&data); if(data) option_ask_overwrite = true; else option_ask_overwrite = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_NOTIFY],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_NOTIFY],(ULONG *)&data); if(data) option_download_notify = true; else option_download_notify = false; - GetAttr(GETFILE_Drawer,gow->gadgets[GID_OPTS_DLDIR],(ULONG *)&data); + GetAttr(GETFILE_Drawer,gow->objects[GID_OPTS_DLDIR],(ULONG *)&data); if(option_download_dir) free(option_download_dir); option_download_dir = (char *)strdup((char *)data); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_TAB_ACTIVE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_TAB_ACTIVE],(ULONG *)&data); if(data) option_new_tab_active = false; else option_new_tab_active = true; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_TAB_2],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_TAB_2],(ULONG *)&data); if(data) option_button_2_tab = true; else option_button_2_tab = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_SEARCH_URLBAR],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_SEARCH_URLBAR],(ULONG *)&data); if(data) option_search_url_bar = true; else option_search_url_bar = false; - GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_SEARCH_PROV],(ULONG *)&option_search_provider); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_SEARCH_PROV],(ULONG *)&option_search_provider); search_web_provider_details(option_search_provider); search_web_retrieve_ico(false); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_CLIPBOARD],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_CLIPBOARD],(ULONG *)&data); if(data) option_utf8_clipboard = true; else option_utf8_clipboard = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_CMENU_ENABLE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_CMENU_ENABLE],(ULONG *)&data); if(data) option_context_menu = true; else option_context_menu = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_CMENU_STICKY],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_CMENU_STICKY],(ULONG *)&data); if(data) option_sticky_context_menu = true; else option_sticky_context_menu = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_STARTUP_NO_WIN],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_STARTUP_NO_WIN],(ULONG *)&data); if(data) option_startup_no_window = true; else option_startup_no_window = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_CLOSE_NO_QUIT],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_CLOSE_NO_QUIT],(ULONG *)&data); if(data) option_close_no_quit = true; else option_close_no_quit = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_DOCKY],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_DOCKY],(ULONG *)&data); if(data) option_hide_docky_icon = false; else option_hide_docky_icon = true; - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_MARGIN_TOP],(ULONG *)&option_margin_top); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_MARGIN_TOP],(ULONG *)&option_margin_top); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_MARGIN_LEFT],(ULONG *)&option_margin_left); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_MARGIN_LEFT],(ULONG *)&option_margin_left); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_MARGIN_BOTTOM],(ULONG *)&option_margin_bottom); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_MARGIN_BOTTOM],(ULONG *)&option_margin_bottom); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_MARGIN_RIGHT],(ULONG *)&option_margin_right); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_MARGIN_RIGHT],(ULONG *)&option_margin_right); - GetAttr(INTEGER_Number,gow->gadgets[GID_OPTS_EXPORT_SCALE],(ULONG *)&option_export_scale); + GetAttr(INTEGER_Number,gow->objects[GID_OPTS_EXPORT_SCALE],(ULONG *)&option_export_scale); - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_EXPORT_NOIMAGES],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_EXPORT_NOIMAGES],(ULONG *)&data); if(data) option_suppress_images = true; else option_suppress_images = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_EXPORT_NOBKG],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_EXPORT_NOBKG],(ULONG *)&data); if(data) option_remove_backgrounds = true; else option_remove_backgrounds = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_EXPORT_LOOSEN],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_EXPORT_LOOSEN],(ULONG *)&data); if(data) option_enable_loosening = true; else option_enable_loosening = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_EXPORT_COMPRESS],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_EXPORT_COMPRESS],(ULONG *)&data); if(data) option_enable_PDF_compression = true; else option_enable_PDF_compression = false; - GetAttr(GA_Selected,gow->gadgets[GID_OPTS_EXPORT_PASSWORD],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_EXPORT_PASSWORD],(ULONG *)&data); if(data) option_enable_PDF_password = true; else option_enable_PDF_password = false; } @@ -1605,13 +1604,13 @@ BOOL ami_gui_opts_event(void) break; case GID_OPTS_HOMEPAGE_DEFAULT: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_HOMEPAGE], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE], gow->win,NULL,STRINGA_TextVal,NETSURF_HOMEPAGE, TAG_DONE); break; case GID_OPTS_HOMEPAGE_CURRENT: - if(curbw) RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_HOMEPAGE], + if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE], gow->win,NULL,STRINGA_TextVal, curbw->current_content->url,TAG_DONE); break; @@ -1619,129 +1618,129 @@ BOOL ami_gui_opts_event(void) case GID_OPTS_FROMLOCALE: if(text = ami_locale_langs()) { - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_CONTENTLANG], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_CONTENTLANG], gow->win,NULL,STRINGA_TextVal, text, TAG_DONE); FreeVec(text); } break; case GID_OPTS_SCREEN: - GetAttr(RADIOBUTTON_Selected,gow->gadgets[GID_OPTS_SCREEN],(ULONG *)&data); + GetAttr(RADIOBUTTON_Selected,gow->objects[GID_OPTS_SCREEN],(ULONG *)&data); switch(data) { case 0: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENMODE], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENMODE], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENNAME], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENNAME], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); break; case 1: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENMODE], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENMODE], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENNAME], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENNAME], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); break; case 2: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENMODE], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENMODE], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_SCREENNAME], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_SCREENNAME], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); break; } break; case GID_OPTS_SCREENMODE: - IDoMethod((Object *)gow->gadgets[GID_OPTS_SCREENMODE], + IDoMethod(gow->objects[GID_OPTS_SCREENMODE], GSM_REQUEST,gow->win); break; case GID_OPTS_THEME: - IDoMethod((Object *)gow->gadgets[GID_OPTS_THEME], + IDoMethod(gow->objects[GID_OPTS_THEME], GFILE_REQUEST,gow->win); break; case GID_OPTS_PROXY: - GetAttr(CHOOSER_Selected,gow->gadgets[GID_OPTS_PROXY],(ULONG *)&data); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_PROXY],(ULONG *)&data); switch(data) { case 0: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_HOST], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_HOST], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PORT], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PORT], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_USER], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_USER], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PASS], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PASS], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); break; case 1: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_HOST], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_HOST], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PORT], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PORT], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_USER], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_USER], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PASS], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PASS], gow->win,NULL, GA_Disabled, TRUE, TAG_DONE); break; case 2: case 3: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_HOST], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_HOST], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PORT], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PORT], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_USER], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_USER], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_PROXY_PASS], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_PROXY_PASS], gow->win,NULL, GA_Disabled, FALSE, TAG_DONE); break; } break; case GID_OPTS_ANIMDISABLE: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_ANIMSPEED], + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_ANIMSPEED], gow->win,NULL, GA_Disabled, code, TAG_DONE); break; case GID_OPTS_FONT_SANS: - IDoMethod((Object *)gow->gadgets[GID_OPTS_FONT_SANS], + IDoMethod(gow->objects[GID_OPTS_FONT_SANS], GFONT_REQUEST,gow->win); break; case GID_OPTS_FONT_SERIF: - IDoMethod((Object *)gow->gadgets[GID_OPTS_FONT_SERIF], + IDoMethod(gow->objects[GID_OPTS_FONT_SERIF], GFONT_REQUEST,gow->win); break; case GID_OPTS_FONT_MONO: - IDoMethod((Object *)gow->gadgets[GID_OPTS_FONT_MONO], + IDoMethod(gow->objects[GID_OPTS_FONT_MONO], GFONT_REQUEST,gow->win); break; case GID_OPTS_FONT_CURSIVE: - IDoMethod((Object *)gow->gadgets[GID_OPTS_FONT_CURSIVE], + IDoMethod(gow->objects[GID_OPTS_FONT_CURSIVE], GFONT_REQUEST,gow->win); break; case GID_OPTS_FONT_FANTASY: - IDoMethod((Object *)gow->gadgets[GID_OPTS_FONT_FANTASY], + IDoMethod(gow->objects[GID_OPTS_FONT_FANTASY], GFONT_REQUEST,gow->win); break; case GID_OPTS_DLDIR: - IDoMethod((Object *)gow->gadgets[GID_OPTS_DLDIR], + IDoMethod(gow->objects[GID_OPTS_DLDIR], GFILE_REQUEST,gow->win); break; case GID_OPTS_CMENU_ENABLE: - RefreshSetGadgetAttrs(gow->gadgets[GID_OPTS_CMENU_STICKY], - gow->win,NULL, GA_Disabled, !code, TAG_DONE); + RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_CMENU_STICKY], + gow->win, NULL, GA_Disabled, !code, TAG_DONE); break; } break; -- cgit v1.2.3