diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-26 00:05:01 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-01-26 00:05:01 +0000 |
commit | 3a5907c1c40bae0ec70acda808eeaa4044bd0943 (patch) | |
tree | ce3a4c75f6c4775313df69801f73235cc8614ec2 /amiga/gui_options.c | |
parent | c8c806a0c2b5dfaa2cf498631c6044baf43493f9 (diff) | |
download | netsurf-3a5907c1c40bae0ec70acda808eeaa4044bd0943.tar.gz netsurf-3a5907c1c40bae0ec70acda808eeaa4044bd0943.tar.bz2 |
Move everything else over to using the class pointers.
Exception: popupmenu.class is still using old _GetClass functions.
Diffstat (limited to 'amiga/gui_options.c')
-rwxr-xr-x | amiga/gui_options.c | 390 |
1 files changed, 194 insertions, 196 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c index e64d3d991..a95e74a3d 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -68,6 +68,7 @@ #include "amiga/gui.h" #include "amiga/gui_options.h" #include "amiga/help.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/theme.h" @@ -530,7 +531,7 @@ void ami_gui_opts_open(void) gow = ami_misc_allocvec_clear(sizeof(struct ami_gui_opts_window), 0); - gow->objects[OID_MAIN] = WindowObject, + gow->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, gadlab[LAB_OPTS_WINTITLE], WA_Activate, TRUE, @@ -544,41 +545,41 @@ void ami_gui_opts_open(void) WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, WA_IDCMP, IDCMP_GADGETUP | IDCMP_CLOSEWINDOW, - WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = VGroupObject, - LAYOUT_AddChild, ClickTabObject, + WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = LayoutVObj, + LAYOUT_AddChild, ClickTabObj, GA_RelVerify, TRUE, GA_Text, tabs, - CLICKTAB_PageGroup, PageObject, + CLICKTAB_PageGroup, PageObj, /* ** General */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_HOMEPAGE], - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = StringObj, GA_ID, GID_OPTS_HOMEPAGE, GA_RelVerify, TRUE, STRINGA_TextVal, homepage_url_lc, STRINGA_BufferPos,0, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_HOMEPAGE], LabelEnd, - LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_DEFAULT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_DEFAULT], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_CURRENT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_CURRENT], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_BLANK, GA_Text,gadlab[GID_OPTS_HOMEPAGE_BLANK], GA_RelVerify,TRUE, @@ -586,30 +587,30 @@ void ami_gui_opts_open(void) LayoutEnd, LayoutEnd, //homepage CHILD_WeightedHeight, 0, - LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTBLOCKING], - LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = CheckBoxObj, GA_ID, GID_OPTS_HIDEADS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_HIDEADS], GA_Selected, nsoption_bool(block_advertisements), CheckBoxEnd, LayoutEnd, // content blocking - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTLANGUAGE], - LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObj, GA_ID, GID_OPTS_CONTENTLANG, GA_RelVerify, TRUE, GA_Disabled, acceptlangdisabled, STRINGA_TextVal, nsoption_charp(accept_language), STRINGA_BufferPos,0, StringEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = CheckBoxObj, GA_ID, GID_OPTS_FROMLOCALE, GA_Text, gadlab[GID_OPTS_FROMLOCALE], GA_RelVerify, TRUE, @@ -618,14 +619,14 @@ void ami_gui_opts_open(void) // CHILD_WeightedWidth, 0, LayoutEnd, // content language LayoutEnd, // content - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_HISTORY], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObj, GA_ID, GID_OPTS_HISTORY, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(expire_url), @@ -634,21 +635,21 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_DAYS], LabelEnd, LayoutEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_HISTORY], LabelEnd, LayoutEnd, // history #if defined(WITH_JS) || defined(WITH_MOZJS) - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCRIPTING], - LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = CheckBoxObj, GA_ID, GID_OPTS_JAVASCRIPT, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_JAVASCRIPT], @@ -658,17 +659,17 @@ void ami_gui_opts_open(void) #endif LayoutEnd, CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_PRIVACY], - LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObj, GA_ID, GID_OPTS_REFERRAL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_REFERRAL], GA_Selected, nsoption_bool(send_referer), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = CheckBoxObj, GA_ID, GID_OPTS_DONOTTRACK, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_DONOTTRACK], @@ -682,22 +683,22 @@ void ami_gui_opts_open(void) /* ** Display */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCREEN], - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObj, GA_ID, GID_OPTS_SCREEN, GA_RelVerify, TRUE, GA_Text, screenopts, RADIOBUTTON_Selected, screenoptsselected, RadioButtonEnd, CHILD_WeightedWidth,0, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObject, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObj, GA_ID, GID_OPTS_SCREENMODE, GA_RelVerify, TRUE, GA_Disabled,screenmodedisabled, @@ -705,7 +706,7 @@ void ami_gui_opts_open(void) GETSCREENMODE_MinDepth, 0, GETSCREENMODE_MaxDepth, 32, GetScreenModeEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObj, GA_ID, GID_OPTS_SCREENNAME, GA_RelVerify, TRUE, GA_Disabled,screennamedisabled, @@ -717,11 +718,11 @@ void ami_gui_opts_open(void) LayoutEnd, LayoutEnd, // screen CHILD_WeightedHeight,0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_WINDOW], - LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObj, GA_ID, GID_OPTS_WIN_SIMPLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_WIN_SIMPLE], @@ -729,11 +730,11 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, // window CHILD_WeightedHeight,0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_THEME], - LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObj, GA_ID, GID_OPTS_THEME, GA_RelVerify, TRUE, GETFILE_Drawer, nsoption_charp(theme), @@ -743,12 +744,12 @@ void ami_gui_opts_open(void) GetFileEnd, LayoutEnd, // theme CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MOUSE], #ifdef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObj, GA_ID, GID_OPTS_PTRTRUE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTRTRUE], @@ -756,7 +757,7 @@ void ami_gui_opts_open(void) GA_Disabled, ptr_disable, CheckBoxEnd, #endif - LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObj, GA_ID, GID_OPTS_PTROS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTROS], @@ -765,7 +766,7 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, // mouse CHILD_WeightedHeight,0, - LAYOUT_AddImage, LabelObject, + LAYOUT_AddImage, LabelObj, LABEL_Text, gadlab[LAB_OPTS_RESTART], LabelEnd, LayoutEnd, // page vgroup @@ -774,31 +775,31 @@ void ami_gui_opts_open(void) /* ** Network */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_PROXY], - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = ChooserObj, GA_ID, GID_OPTS_PROXY, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, CHOOSER_LabelArray, proxyopts, CHOOSER_Selected, proxytype, ChooserEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY], LabelEnd, - LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObj, GA_ID, GID_OPTS_PROXY_HOST, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_host), STRINGA_BufferPos,0, StringEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = IntegerObj, GA_ID, GID_OPTS_PROXY_PORT, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, @@ -808,51 +809,51 @@ void ami_gui_opts_open(void) INTEGER_Arrows, FALSE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, ":", LabelEnd, LayoutEnd, //host:port group CHILD_WeightedHeight, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_HOST], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObj, GA_ID, GID_OPTS_PROXY_USER, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_auth_user), STRINGA_BufferPos,0, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_USER], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObj, GA_ID, GID_OPTS_PROXY_PASS, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_auth_pass), STRINGA_BufferPos,0, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_PASS], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = StringObj, GA_ID, GID_OPTS_PROXY_BYPASS, GA_RelVerify, TRUE, GA_Disabled, proxybypassdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_noproxy), STRINGA_BufferPos, 0, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS], LabelEnd, LayoutEnd, // proxy CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FETCHING], - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObj, GA_ID, GID_OPTS_FETCHMAX, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_fetchers), @@ -861,10 +862,10 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHMAX], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObj, GA_ID, GID_OPTS_FETCHHOST, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_fetchers_per_host), @@ -873,10 +874,10 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHHOST], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObj, GA_ID, GID_OPTS_FETCHCACHE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_cached_fetch_handles), @@ -885,7 +886,7 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHCACHE], LabelEnd, LayoutEnd, @@ -896,23 +897,23 @@ void ami_gui_opts_open(void) /* ** Rendering */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_IMAGES], - LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObj, GA_ID, GID_OPTS_NATIVEBM, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, CHOOSER_LabelArray, nativebmopts, CHOOSER_Selected, nsoption_int(cache_bitmaps), ChooserEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_NATIVEBM], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObj, GA_ID, GID_OPTS_DITHERQ, GA_RelVerify, TRUE, GA_Disabled, ditherdisable, @@ -920,10 +921,10 @@ void ami_gui_opts_open(void) CHOOSER_LabelArray, ditheropts, CHOOSER_Selected, nsoption_int(dither_quality), ChooserEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_DITHERQ], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObj, GA_ID, GID_OPTS_SCALEQ, GA_Disabled, scaledisabled, GA_RelVerify, TRUE, @@ -932,13 +933,13 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, // images CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_ANIMS], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObj, GA_ID, GID_OPTS_ANIMSPEED, GA_RelVerify, TRUE, GA_Disabled, animspeeddisabled, @@ -947,14 +948,14 @@ void ami_gui_opts_open(void) STRINGA_BufferPos,0, StringEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_SECS], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_ANIMSPEED], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj, GA_ID, GID_OPTS_ANIMDISABLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_ANIMDISABLE], @@ -962,13 +963,13 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, //animations CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DPI], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObj, GA_ID, GID_OPTS_DPI_Y, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(screen_ydpi), @@ -977,11 +978,11 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_DPI], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_DPI_Y], LabelEnd, LayoutEnd, //animations @@ -992,33 +993,33 @@ void ami_gui_opts_open(void) /* ** Fonts */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FONTFACES], - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = GetFontObj, GA_ID, GID_OPTS_FONT_SANS, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontsans, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, GetFontEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SANS], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObj, GA_ID, GID_OPTS_FONT_SERIF, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontserif, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, GetFontEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SERIF], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObj, GA_ID, GID_OPTS_FONT_MONO, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontmono, @@ -1026,49 +1027,49 @@ void ami_gui_opts_open(void) GETFONT_ScalableOnly, TRUE, GETFONT_FixedWidthOnly, TRUE, GetFontEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_MONO], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObj, GA_ID, GID_OPTS_FONT_CURSIVE, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontcursive, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, GetFontEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_CURSIVE], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObj, GA_ID, GID_OPTS_FONT_FANTASY, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontfantasy, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, GetFontEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY], LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObj, GA_ID, GID_OPTS_FONT_DEFAULT, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, CHOOSER_LabelArray, fontopts, CHOOSER_Selected, nsoption_int(font_default) - PLOT_FONT_FAMILY_SANS_SERIF, ChooserEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_DEFAULT], LabelEnd, LayoutEnd, // font faces CHILD_WeightedHeight, 0, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObj, GA_ID, GID_OPTS_FONT_SIZE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(font_size) / 10, @@ -1077,16 +1078,16 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_PT], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SIZE], LabelEnd, - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObj, GA_ID, GID_OPTS_FONT_MINSIZE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(font_min_size) / 10, @@ -1095,20 +1096,20 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_PT], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE], LabelEnd, LayoutEnd, #ifdef __amigaos4__ - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObj, GA_ID, GID_OPTS_FONT_ANTIALIASING, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FONT_ANTIALIASING], @@ -1124,15 +1125,15 @@ void ami_gui_opts_open(void) /* ** Cache */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild, VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MEMCACHE], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObj, GA_ID, GID_OPTS_CACHE_MEM, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(memory_cache_size) / 1048576, @@ -1141,22 +1142,22 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MB], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_CACHE_MEM], LabelEnd, LayoutEnd, // memory cache CHILD_WeightedHeight, 0, - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DISCCACHE], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObj, GA_ID, GID_OPTS_CACHE_DISC, GA_RelVerify, TRUE, INTEGER_Number, nsoption_uint(disc_cache_size) / 1048576, @@ -1165,11 +1166,11 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MB], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_CACHE_DISC], LabelEnd, LayoutEnd, // disc cache @@ -1180,38 +1181,38 @@ void ami_gui_opts_open(void) /* ** Tabs */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,HGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_TABS], - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = CheckBoxObj, GA_ID, GID_OPTS_TAB_ACTIVE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ACTIVE], GA_Selected, !nsoption_bool(new_tab_is_active), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = CheckBoxObj, GA_ID, GID_OPTS_TAB_LAST, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_LAST], GA_Selected, nsoption_bool(new_tab_last), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = CheckBoxObj, GA_ID, GID_OPTS_TAB_2, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_2], GA_Selected, nsoption_bool(button_2_tab), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = CheckBoxObj, GA_ID, GID_OPTS_TAB_ALWAYS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ALWAYS], GA_Selected, nsoption_bool(tab_always_show), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj, GA_ID, GID_OPTS_TAB_CLOSE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_CLOSE], @@ -1225,14 +1226,14 @@ void ami_gui_opts_open(void) /* ** Advanced */ - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild,VGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DOWNLOADS], - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObj, GA_ID, GID_OPTS_OVERWRITE, GA_RelVerify, TRUE, GA_Disabled, FALSE, @@ -1240,7 +1241,7 @@ void ami_gui_opts_open(void) GA_Selected, nsoption_bool(ask_overwrite), CheckBoxEnd, #ifdef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObj, GA_ID, GID_OPTS_NOTIFY, GA_RelVerify, TRUE, GA_Disabled, download_notify_disabled, @@ -1249,7 +1250,7 @@ void ami_gui_opts_open(void) CheckBoxEnd, #endif LayoutEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObj, GA_ID, GID_OPTS_DLDIR, GA_RelVerify, TRUE, GETFILE_Drawer, nsoption_charp(download_dir), @@ -1257,31 +1258,30 @@ void ami_gui_opts_open(void) GETFILE_ReadOnly, TRUE, GETFILE_FullFileExpand, FALSE, GetFileEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_DLDIR], LabelEnd, LayoutEnd, // downloads CHILD_WeightedHeight, 0, - LAYOUT_AddChild,HGroupObject, - - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_BEHAVIOUR], - LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObj, GA_ID, GID_OPTS_STARTUP_NO_WIN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_STARTUP_NO_WIN], GA_Selected, nsoption_bool(startup_no_window), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObj, GA_ID, GID_OPTS_CLOSE_NO_QUIT, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLOSE_NO_QUIT], GA_Selected, nsoption_bool(close_no_quit), CheckBoxEnd, #ifdef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObj, GA_ID, GID_OPTS_DOCKY, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_DOCKY], @@ -1290,15 +1290,14 @@ void ami_gui_opts_open(void) #endif LayoutEnd, // behaviour CHILD_WeightedHeight, 0, - LayoutEnd, // hgroup CHILD_WeightedHeight, 0, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild,HGroupObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD], - LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObj, GA_ID, GID_OPTS_CLIPBOARD, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLIPBOARD], @@ -1306,11 +1305,11 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, // clipboard CHILD_WeightedHeight, 0, - LAYOUT_AddChild,HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SEARCH], - LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObj, GA_ID, GID_OPTS_SEARCH_PROV, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -1318,20 +1317,19 @@ void ami_gui_opts_open(void) CHOOSER_Selected, nsoption_int(search_provider), CHOOSER_MaxLabels, 40, ChooserEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV], LabelEnd, LayoutEnd, // search CHILD_WeightedHeight, 0, LayoutEnd, // hgroup CHILD_WeightedHeight, 0, - - LAYOUT_AddChild,HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], LAYOUT_SpaceOuter, TRUE, #ifdef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_CONTEXTMENU] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CONTEXTMENU] = CheckBoxObj, GA_ID, GID_OPTS_CONTEXTMENU, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CONTEXTMENU], @@ -1339,7 +1337,7 @@ void ami_gui_opts_open(void) GA_Disabled, !popupmenu_lib_ok, CheckBoxEnd, #endif - LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObj, GA_ID, GID_OPTS_FASTSCROLL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FASTSCROLL], @@ -1355,15 +1353,15 @@ void ami_gui_opts_open(void) ** Export */ #ifdef WITH_PDF_EXPORT - PAGE_Add, LayoutObject, - LAYOUT_AddChild,VGroupObject, - LAYOUT_AddChild, HGroupObject, + PAGE_Add, LayoutVObj, + LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MARGINS], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObj, GA_ID, GID_OPTS_MARGIN_TOP, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_top), @@ -1372,16 +1370,16 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_TOP], LabelEnd, - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObj, GA_ID, GID_OPTS_MARGIN_LEFT, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_left), @@ -1390,16 +1388,16 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_LEFT], LabelEnd, - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObj, GA_ID, GID_OPTS_MARGIN_BOTTOM, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_bottom), @@ -1408,16 +1406,16 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_BOTTOM], LabelEnd, - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObj, GA_ID, GID_OPTS_MARGIN_RIGHT, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_right), @@ -1426,22 +1424,22 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_RIGHT], LabelEnd, LayoutEnd, // margins CHILD_WeightedHeight, 0, - LAYOUT_AddChild, VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCALING], - LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild, LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObj, GA_ID, GID_OPTS_EXPORT_SCALE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(export_scale), @@ -1450,32 +1448,32 @@ void ami_gui_opts_open(void) INTEGER_Arrows, TRUE, IntegerEnd, CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, "%", LabelEnd, LayoutEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text, gadlab[GID_OPTS_EXPORT_SCALE], LabelEnd, LayoutEnd, // scaling CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_APPEARANCE], - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObj, GA_ID, GID_OPTS_EXPORT_NOIMAGES, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOIMAGES], GA_Selected, nsoption_bool(suppress_images), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = CheckBoxObj, GA_ID, GID_OPTS_EXPORT_NOBKG, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOBKG], GA_Selected, nsoption_bool(remove_backgrounds), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObj, GA_ID, GID_OPTS_EXPORT_LOOSEN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_LOOSEN], @@ -1483,17 +1481,17 @@ void ami_gui_opts_open(void) CheckBoxEnd, LayoutEnd, // appearance CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_ADVANCED], - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObj, GA_ID, GID_OPTS_EXPORT_COMPRESS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_COMPRESS], GA_Selected, nsoption_bool(enable_PDF_compression), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObj, GA_ID, GID_OPTS_EXPORT_PASSWORD, GA_RelVerify, TRUE, GA_Disabled, TRUE, @@ -1508,18 +1506,18 @@ void ami_gui_opts_open(void) #endif End, // pagegroup ClickTabEnd, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObj, GA_ID,GID_OPTS_SAVE, GA_Text,gadlab[GID_OPTS_SAVE], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = ButtonObj, GA_ID,GID_OPTS_USE, GA_Text,gadlab[GID_OPTS_USE], GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = ButtonObject, + LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = ButtonObj, GA_ID,GID_OPTS_CANCEL, GA_Text,gadlab[GID_OPTS_CANCEL], GA_RelVerify,TRUE, |