From c8c806a0c2b5dfaa2cf498631c6044baf43493f9 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 25 Jan 2015 12:45:20 +0000 Subject: Convert the rest of gui.c to use class pointers directly Add missing button.gadget --- amiga/gui.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'amiga/gui.c') diff --git a/amiga/gui.c b/amiga/gui.c index 392873636..05c0f1e8c 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1517,7 +1517,7 @@ 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] = ScrollerObject, + gwin->objects[GID_HSCROLL] = ScrollerObj, GA_ID, GID_HSCROLL, GA_RelVerify, TRUE, SCROLLER_Orientation, SORIENT_HORIZ, @@ -1559,7 +1559,7 @@ 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] = ScrollerObject, + gwin->objects[GID_VSCROLL] = ScrollerObj, GA_ID, GID_VSCROLL, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, @@ -3148,7 +3148,7 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { gwin->objects[GID_HOTLIST] = - SpeedBarObject, + SpeedBarObj, GA_ID, GID_HOTLIST, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, @@ -3157,7 +3157,7 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) SpeedBarEnd; gwin->objects[GID_HOTLISTSEPBAR] = - BevelObject, + BevelObj, BEVEL_Style, BVS_SBAR_VERT, BevelEnd; @@ -3288,7 +3288,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] = ClickTabObject, + gwin->objects[GID_TABS] = ClickTabObj, GA_ID, GID_TABS, GA_RelVerify, TRUE, GA_Underscore, 13, // disable kb shortcuts @@ -3298,7 +3298,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show) CLICKTAB_FlagImage, gwin->objects[GID_TABS_FLAG], ClickTabEnd; - gwin->objects[GID_ADDTAB] = ButtonObject, + gwin->objects[GID_ADDTAB] = ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_HintInfo, gwin->helphints[GID_ADDTAB], @@ -3674,13 +3674,13 @@ gui_window_create(struct browser_window *bw, if(ClickTabBase->lib_Version < 53) { addtabclosegadget = LAYOUT_AddChild; - g->shared->objects[GID_CLOSETAB] = ButtonObject, + g->shared->objects[GID_CLOSETAB] = ButtonObj, GA_ID, GID_CLOSETAB, GA_RelVerify, TRUE, BUTTON_RenderImage, g->shared->objects[GID_CLOSETAB_BM], ButtonEnd; - g->shared->objects[GID_TABS] = ClickTabObject, + g->shared->objects[GID_TABS] = ClickTabObj, GA_ID,GID_TABS, GA_RelVerify,TRUE, GA_Underscore,13, // disable kb shortcuts @@ -3688,7 +3688,7 @@ gui_window_create(struct browser_window *bw, CLICKTAB_LabelTruncate,TRUE, ClickTabEnd; - g->shared->objects[GID_ADDTAB] = ButtonObject, + g->shared->objects[GID_ADDTAB] = ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_Text, "+", @@ -3746,7 +3746,7 @@ gui_window_create(struct browser_window *bw, LAYOUT_SpaceOuter, TRUE, LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObj, GA_ID,GID_BACK, GA_RelVerify,TRUE, GA_Disabled,TRUE, @@ -3761,7 +3761,7 @@ gui_window_create(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = ButtonObj, GA_ID,GID_FORWARD, GA_RelVerify,TRUE, GA_Disabled,TRUE, @@ -3776,7 +3776,7 @@ gui_window_create(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_STOP] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_STOP] = ButtonObj, GA_ID,GID_STOP, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_STOP], @@ -3790,7 +3790,7 @@ gui_window_create(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = ButtonObj, GA_ID,GID_RELOAD, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_RELOAD], @@ -3804,7 +3804,7 @@ gui_window_create(struct browser_window *bw, ButtonEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_HOME] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_HOME] = ButtonObj, GA_ID,GID_HOME, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_HOME], @@ -3820,7 +3820,7 @@ gui_window_create(struct browser_window *bw, CHILD_WeightedHeight,0, LAYOUT_AddChild, LayoutHObj, // FavIcon, URL bar and hotlist star LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObj, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, @@ -3840,7 +3840,7 @@ gui_window_create(struct browser_window *bw, STRINGVIEW_Header, URLHistory_GetList(), TAG_DONE), - LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObject, + LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObj, GA_ID, GID_FAVE, GA_RelVerify, TRUE, // GA_HintInfo, g->shared->helphints[GID_FAVE], @@ -3855,7 +3855,7 @@ gui_window_create(struct browser_window *bw, LAYOUT_WeightBar, TRUE, LAYOUT_AddChild, LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObject, + LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObj, GA_ID, GID_SEARCH_ICON, GA_RelVerify, TRUE, CHOOSER_DropDown, TRUE, @@ -3864,7 +3864,7 @@ gui_window_create(struct browser_window *bw, ChooserEnd, CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] =StringObject, + LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = StringObj, GA_ID,GID_SEARCHSTRING, STRINGA_TextVal, NULL, GA_RelVerify,TRUE, @@ -3872,7 +3872,7 @@ gui_window_create(struct browser_window *bw, StringEnd, LayoutEnd, CHILD_WeightedWidth, nsoption_int(web_search_width), - LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = SpaceObj, GA_ID,GID_THROBBER, SPACE_MinWidth,throbber_width, SPACE_MinHeight,throbber_height, @@ -3883,7 +3883,7 @@ gui_window_create(struct browser_window *bw, CHILD_WeightedHeight,0, LayoutEnd, CHILD_WeightedHeight,0, - LAYOUT_AddImage, BevelObject, + LAYOUT_AddImage, BevelObj, BEVEL_Style, BVS_SBAR_VERT, BevelEnd, CHILD_WeightedHeight, 0, @@ -3907,7 +3907,7 @@ gui_window_create(struct browser_window *bw, CHILD_WeightedHeight,0, LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj, LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SpaceEnd, @@ -3954,7 +3954,7 @@ gui_window_create(struct browser_window *bw, 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] = SpaceObject, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SpaceEnd, -- cgit v1.2.3