From 3a5907c1c40bae0ec70acda808eeaa4044bd0943 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Mon, 26 Jan 2015 00:05:01 +0000 Subject: Move everything else over to using the class pointers. Exception: popupmenu.class is still using old _GetClass functions. --- amiga/agclass/amigaguide_class.c | 2 +- amiga/arexx.c | 5 +- amiga/download.c | 9 +- amiga/font_scan.c | 9 +- amiga/gui_options.c | 390 +++++++++++++++++++-------------------- amiga/history_local.c | 7 +- amiga/libs.c | 46 ++--- amiga/libs.h | 43 +++-- amiga/login.c | 27 +-- amiga/menu.c | 5 +- amiga/print.c | 20 +- amiga/search.c | 22 +-- amiga/stringview/stringview.c | 4 +- amiga/tree.c | 18 +- 14 files changed, 315 insertions(+), 292 deletions(-) diff --git a/amiga/agclass/amigaguide_class.c b/amiga/agclass/amigaguide_class.c index e0f6600ef..556445e1b 100644 --- a/amiga/agclass/amigaguide_class.c +++ b/amiga/agclass/amigaguide_class.c @@ -45,7 +45,7 @@ Class *initAGClass(void) // Open amigaguide.library and its interface. - if ( (AmigaGuideBase = OpenLibrary("amigaguide.library", 52)) ) + if ( (AmigaGuideBase = OpenLibrary("amigaguide.library", 40)) ) { #ifdef __amigaos4__ if ( (IAmigaGuide = (struct AmigaGuideIFace *)GetInterface(AmigaGuideBase, "main", 1L, NULL)) ) diff --git a/amiga/arexx.c b/amiga/arexx.c index eb2a6c10a..65f1ebab5 100644 --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -38,6 +38,7 @@ #include "amiga/download.h" #include "amiga/gui.h" #include "amiga/hotlist.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/theme.h" @@ -106,7 +107,7 @@ STATIC struct ARexxCmd Commands[] = BOOL ami_arexx_init(void) { - if((arexx_obj = ARexxObject, + if((arexx_obj = ARexxObj, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,TRUE, @@ -121,7 +122,7 @@ BOOL ami_arexx_init(void) { /* Create a temporary ARexx port so we can send commands to the NetSurf which * is already running */ - arexx_obj = ARexxObject, + arexx_obj = ARexxObj, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,FALSE, diff --git a/amiga/download.c b/amiga/download.c index e9d1a71f2..faa71dbc8 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -62,6 +62,7 @@ #include "amiga/file.h" #include "amiga/drag.h" #include "amiga/iff_dr2d.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/theme.h" #include "amiga/utf8.h" @@ -147,7 +148,7 @@ static struct gui_download_window *gui_download_window_create(download_context * return NULL; } - dw->objects[OID_MAIN] = WindowObject, + dw->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, dw->url, WA_Activate, TRUE, @@ -161,8 +162,8 @@ static struct gui_download_window *gui_download_window_create(download_context * WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, dw->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, dw->objects[GID_STATUS] = FuelGaugeObject, + WINDOW_ParentGroup, dw->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, dw->objects[GID_STATUS] = FuelGaugeObj, GA_ID,GID_STATUS, GA_Text,messages_get("amiDownload"), FUELGAUGE_Min,0, @@ -176,7 +177,7 @@ static struct gui_download_window *gui_download_window_create(download_context * FuelGaugeEnd, CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, - LAYOUT_AddChild, dw->objects[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, dw->objects[GID_CANCEL] = ButtonObj, GA_ID,GID_CANCEL, GA_RelVerify,TRUE, GA_Text,messages_get("Abort"), diff --git a/amiga/font_scan.c b/amiga/font_scan.c index 8304c601e..a698110ef 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -50,6 +50,7 @@ #include "amiga/font_scan.h" #include "amiga/gui.h" +#include "amiga/libs.h" #include "amiga/object.h" #include "amiga/utf8.h" @@ -104,7 +105,7 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) fsw->title = ami_utf8_easy(messages_get("FontScanning")); fsw->glyphtext = ami_utf8_easy(messages_get("FontGlyphs")); - fsw->objects[FS_OID_MAIN] = WindowObject, + fsw->objects[FS_OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, fsw->title, WA_Activate, TRUE, @@ -119,8 +120,8 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockHeight, TRUE, - WINDOW_ParentGroup, fsw->objects[FS_GID_MAIN] = VGroupObject, - LAYOUT_AddChild, fsw->objects[FS_GID_FONTS] = FuelGaugeObject, + WINDOW_ParentGroup, fsw->objects[FS_GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, fsw->objects[FS_GID_FONTS] = FuelGaugeObj, GA_ID, FS_GID_FONTS, GA_Text, fsw->title, FUELGAUGE_Min, 0, @@ -133,7 +134,7 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) FuelGaugeEnd, CHILD_NominalSize, TRUE, CHILD_WeightedHeight, 0, - LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = FuelGaugeObject, + LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = FuelGaugeObj, GA_ID, FS_GID_GLYPHS, //GA_Text, "Glyphs", FUELGAUGE_Min, 0x0000, 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, diff --git a/amiga/history_local.c b/amiga/history_local.c index 2484ffb0f..b56293d48 100755 --- a/amiga/history_local.c +++ b/amiga/history_local.c @@ -50,6 +50,7 @@ #include "desktop/gui_window.h" #include "graphics/rpattr.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/gui.h" @@ -124,7 +125,7 @@ void ami_history_open(struct gui_window *gw) gw->hw->scrollerhook.h_Entry = (void *)ami_history_scroller_hook; gw->hw->scrollerhook.h_Data = gw->hw; - gw->hw->objects[OID_MAIN] = WindowObject, + gw->hw->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, messages_get("History"), WA_Activate, TRUE, @@ -146,8 +147,8 @@ void ami_history_open(struct gui_window *gw) WINDOW_IDCMPHookBits,IDCMP_IDCMPUPDATE, // WA_ReportMouse,TRUE, WA_IDCMP,IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE, // | IDCMP_MOUSEMOVE, - WINDOW_ParentGroup, gw->hw->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, gw->hw->objects[GID_BROWSER] = SpaceObject, + WINDOW_ParentGroup, gw->hw->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, gw->hw->objects[GID_BROWSER] = SpaceObj, GA_ID,GID_BROWSER, // SPACE_MinWidth,width, // SPACE_MinHeight,height, diff --git a/amiga/libs.c b/amiga/libs.c index b6b3eac47..efb249d49 100644 --- a/amiga/libs.c +++ b/amiga/libs.c @@ -230,32 +230,32 @@ bool ami_libs_open(void) /* BOOPSI classes. * Opened using class functions rather than the old-fashioned method. * We get the class pointer once and used our stored copy. - * NB: the last argument needs to be "true" whilst we still have old macros - * lying around, and then "false" unless the class also has library functions. * On OS4 these must be opened *after* intuition.library. + * NB: the last argument should be "true" only if the class also has + * library functions we use. */ - AMINS_CLASS_OPEN("arexx.class", 44, ARexx, AREXX, true) - AMINS_CLASS_OPEN("images/bevel.image", 44, Bevel, BEVEL, true) - AMINS_CLASS_OPEN("images/bitmap.image", 44, BitMap, BITMAP, true) - AMINS_CLASS_OPEN("gadgets/button.gadget", 44, Button, BUTTON, true) - AMINS_CLASS_OPEN("gadgets/checkbox.gadget", 44, CheckBox, CHECKBOX, true) - AMINS_CLASS_OPEN("gadgets/chooser.gadget", 44, Chooser, CHOOSER, true) - AMINS_CLASS_OPEN("gadgets/clicktab.gadget", 44, ClickTab, CLICKTAB, true) - AMINS_CLASS_OPEN("gadgets/fuelgauge.gadget", 44, FuelGauge, FUELGAUGE, true) - AMINS_CLASS_OPEN("gadgets/getfile.gadget", 44, GetFile, GETFILE, true) - AMINS_CLASS_OPEN("gadgets/getfont.gadget", 44, GetFont, GETFONT, true) - AMINS_CLASS_OPEN("gadgets/getscreenmode.gadget", 44, GetScreenMode, GETSCREENMODE, true) - AMINS_CLASS_OPEN("gadgets/integer.gadget", 44, Integer, INTEGER, true) - AMINS_CLASS_OPEN("images/label.image", 44, Label, LABEL, true) - AMINS_CLASS_OPEN("gadgets/layout.gadget", 44, Layout, LAYOUT, true) - AMINS_CLASS_OPEN("gadgets/listbrowser.gadget", 44, ListBrowser, LISTBROWSER, false) - AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, true) - AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, true) - AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, true) - AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, true) - AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, true) - AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, true) + AMINS_CLASS_OPEN("arexx.class", 44, ARexx, AREXX, false) + AMINS_CLASS_OPEN("images/bevel.image", 44, Bevel, BEVEL, false) + AMINS_CLASS_OPEN("images/bitmap.image", 44, BitMap, BITMAP, false) + AMINS_CLASS_OPEN("gadgets/button.gadget", 44, Button, BUTTON, false) + AMINS_CLASS_OPEN("gadgets/checkbox.gadget", 44, CheckBox, CHECKBOX, false) + AMINS_CLASS_OPEN("gadgets/chooser.gadget", 44, Chooser, CHOOSER, true) + AMINS_CLASS_OPEN("gadgets/clicktab.gadget", 44, ClickTab, CLICKTAB, true) + AMINS_CLASS_OPEN("gadgets/fuelgauge.gadget", 44, FuelGauge, FUELGAUGE, false) + AMINS_CLASS_OPEN("gadgets/getfile.gadget", 44, GetFile, GETFILE, false) + AMINS_CLASS_OPEN("gadgets/getfont.gadget", 44, GetFont, GETFONT, false) + AMINS_CLASS_OPEN("gadgets/getscreenmode.gadget", 44, GetScreenMode, GETSCREENMODE, false) + AMINS_CLASS_OPEN("gadgets/integer.gadget", 44, Integer, INTEGER, false) + AMINS_CLASS_OPEN("images/label.image", 44, Label, LABEL, false) + AMINS_CLASS_OPEN("gadgets/layout.gadget", 44, Layout, LAYOUT, true) + AMINS_CLASS_OPEN("gadgets/listbrowser.gadget", 44, ListBrowser, LISTBROWSER, false) + AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, false) + AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, false) + AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, false) + AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, false) + AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, false) + AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, false) return true; } diff --git a/amiga/libs.h b/amiga/libs.h index c80c61e73..a3ce92b2f 100644 --- a/amiga/libs.h +++ b/amiga/libs.h @@ -21,13 +21,22 @@ #include /* BOOPSI classes */ +extern Class *ARexxClass; extern Class *BevelClass; extern Class *BitMapClass; extern Class *ButtonClass; +extern Class *CheckBoxClass; extern Class *ChooserClass; extern Class *ClickTabClass; +extern Class *FuelGaugeClass; +extern Class *GetFileClass; +extern Class *GetFontClass; +extern Class *GetScreenModeClass; +extern Class *IntegerClass; +extern Class *LabelClass; extern Class *LayoutClass; extern Class *ListBrowserClass; +extern Class *RadioButtonClass; extern Class *ScrollerClass; extern Class *SpaceClass; extern Class *SpeedBarClass; @@ -35,18 +44,28 @@ extern Class *StringClass; extern Class *WindowClass; /* New improved ReAction macros! */ -#define BevelObj NewObject(BevelClass, NULL -#define BitMapObj NewObject(BitMapClass, NULL -#define ButtonObj NewObject(ButtonClass, NULL -#define ChooserObj NewObject(ChooserClass, NULL -#define ClickTabObj NewObject(ClickTabClass, NULL -#define LayoutHObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_HORIZ -#define LayoutVObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_VERT -#define ScrollerObj NewObject(ScrollerClass, NULL -#define SpaceObj NewObject(SpaceClass, NULL -#define SpeedBarObj NewObject(ScrollerClass, NULL -#define StringObj NewObject(StringClass, NULL -#define WindowObj NewObject(WindowClass, NULL +#define ARexxObj NewObject(ARexxClass, NULL +#define BevelObj NewObject(BevelClass, NULL +#define BitMapObj NewObject(BitMapClass, NULL +#define ButtonObj NewObject(ButtonClass, NULL +#define CheckBoxObj NewObject(CheckBoxClass, NULL +#define ChooserObj NewObject(ChooserClass, NULL +#define ClickTabObj NewObject(ClickTabClass, NULL +#define FuelGaugeObj NewObject(FuelGaugeClass, NULL +#define GetFileObj NewObject(GetFileClass, NULL +#define GetFontObj NewObject(GetFileClass, NULL +#define GetScreenModeObj NewObject(GetScreenModeClass, NULL +#define IntegerObj NewObject(IntegerClass, NULL +#define LabelObj NewObject(LabelClass, NULL +#define LayoutHObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_HORIZ +#define LayoutVObj NewObject(LayoutClass, NULL, LAYOUT_Orientation, LAYOUT_ORIENT_VERT +#define PageObj NewObject(NULL, "page.gadget" +#define RadioButtonObj NewObject(RadioButtonClass, NULL +#define ScrollerObj NewObject(ScrollerClass, NULL +#define SpaceObj NewObject(SpaceClass, NULL +#define SpeedBarObj NewObject(ScrollerClass, NULL +#define StringObj NewObject(StringClass, NULL +#define WindowObj NewObject(WindowClass, NULL /* Functions */ bool ami_libs_open(void); diff --git a/amiga/login.c b/amiga/login.c index 611ba2adf..655a4b13b 100755 --- a/amiga/login.c +++ b/amiga/login.c @@ -43,6 +43,7 @@ #include "desktop/gui_window.h" #include "amiga/gui.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/login.h" @@ -95,7 +96,7 @@ void gui_401login_open(nsurl *url, const char *realm, lw->pwd[pwd_len] = '\0'; } - lw->objects[OID_MAIN] = WindowObject, + lw->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, nsurl_access(lw->url), WA_Activate, TRUE, @@ -109,52 +110,52 @@ void gui_401login_open(nsurl *url, const char *realm, WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, lw->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, StringObject, + WINDOW_ParentGroup, lw->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, StringObj, STRINGA_TextVal, lwc_string_data(lw->host), GA_ReadOnly,TRUE, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Host"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, StringObject, + LAYOUT_AddChild, StringObj, STRINGA_TextVal,lw->realm, GA_ReadOnly,TRUE, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Realm"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_USER] = StringObject, + LAYOUT_AddChild, lw->objects[GID_USER] = StringObj, GA_ID,GID_USER, GA_TabCycle,TRUE, STRINGA_TextVal, lw->uname, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Username"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_PASS] = StringObject, + LAYOUT_AddChild, lw->objects[GID_PASS] = StringObj, GA_ID,GID_PASS, STRINGA_HookType,SHK_PASSWORD, GA_TabCycle,TRUE, STRINGA_TextVal, lw->pwd, StringEnd, - CHILD_Label, LabelObject, + CHILD_Label, LabelObj, LABEL_Text,messages_get("Password"), LabelEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, lw->objects[GID_LOGIN] = ButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, lw->objects[GID_LOGIN] = ButtonObj, GA_ID,GID_LOGIN, GA_RelVerify,TRUE, GA_Text,messages_get("Login"), GA_TabCycle,TRUE, ButtonEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, lw->objects[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, lw->objects[GID_CANCEL] = ButtonObj, GA_ID,GID_CANCEL, GA_RelVerify,TRUE, GA_Text,messages_get("Cancel"), diff --git a/amiga/menu.c b/amiga/menu.c index 111b16540..efc769938 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -61,6 +61,7 @@ #include "amiga/history.h" #include "amiga/history_local.h" #include "amiga/hotlist.h" +#include "amiga/libs.h" #include "amiga/menu.h" #include "amiga/misc.h" #include "amiga/print.h" @@ -429,7 +430,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) int icon_width = 0; Object *blank_space = NULL; Object *submenuarrow = NULL; - Object *icon = BitMapObject, + Object *icon = BitMapObj, BITMAP_Screen, scrn, BITMAP_SourceFile, gwin->menuicon[i], BITMAP_Masking, TRUE, @@ -487,7 +488,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) TAG_DONE); } - gwin->menuobj[i] = LabelObject, + gwin->menuobj[i] = LabelObj, LABEL_MenuMode, TRUE, LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, diff --git a/amiga/print.c b/amiga/print.c index 5c89705d3..25230112f 100644 --- a/amiga/print.c +++ b/amiga/print.c @@ -55,6 +55,7 @@ #include "amiga/plotters.h" #include "amiga/gui.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/print.h" #include "amiga/utf8.h" @@ -243,7 +244,7 @@ void ami_print_ui(struct hlcache_handle *c) ami_print_ui_setup(); - pw->objects[OID_MAIN] = WindowObject, + pw->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, gadlab[PGID_PRINT], WA_Activate, TRUE, @@ -256,7 +257,7 @@ void ami_print_ui(struct hlcache_handle *c) WINDOW_UserData, pw, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = VGroupObject, + WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = LayoutVObj, LAYOUT_AddChild, ChooserObject, GA_ID, PGID_PRINTER, GA_RelVerify, TRUE, @@ -281,7 +282,7 @@ void ami_print_ui(struct hlcache_handle *c) LabelEnd, LAYOUT_AddChild, HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = IntegerObject, + LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = IntegerObj, GA_ID, PGID_SCALE, GA_RelVerify, TRUE, GA_TabCycle, TRUE, @@ -299,14 +300,14 @@ void ami_print_ui(struct hlcache_handle *c) LABEL_Text, gadlab[PGID_SCALE], LabelEnd, LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = ButtonObject, + LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = ButtonObj, GA_ID, PGID_PRINT, GA_RelVerify,TRUE, GA_Text, gadlab[PGID_PRINT], GA_TabCycle,TRUE, ButtonEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, pw->gadgets[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, pw->gadgets[GID_CANCEL] = ButtonObj, GA_ID, PGID_CANCEL, GA_RelVerify, TRUE, GA_Text, gadlab[PGID_CANCEL], @@ -538,7 +539,7 @@ bool ami_print_dump(void) void ami_print_progress(void) { - ami_print_info.objects[OID_MAIN] = WindowObject, + ami_print_info.objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, messages_get("Printing"), WA_Activate, TRUE, @@ -552,8 +553,8 @@ void ami_print_progress(void) WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_print_info.gadgets[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, ami_print_info.gadgets[GID_STATUS] = FuelGaugeObject, + WINDOW_ParentGroup, ami_print_info.gadgets[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, ami_print_info.gadgets[GID_STATUS] = FuelGaugeObj, GA_ID,GID_STATUS, FUELGAUGE_Min,0, FUELGAUGE_Max,ami_print_info.pages, @@ -566,7 +567,7 @@ void ami_print_progress(void) CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, /* - LAYOUT_AddChild, ami_print_info.gadgets[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, ami_print_info.gadgets[GID_CANCEL] = ButtonObj, GA_ID,GID_CANCEL, GA_Disabled,TRUE, GA_RelVerify,TRUE, @@ -579,3 +580,4 @@ void ami_print_progress(void) ami_print_info.win = (struct Window *)RA_OpenWindow(ami_print_info.objects[OID_MAIN]); } + diff --git a/amiga/search.c b/amiga/search.c index b974651e0..5ca979220 100755 --- a/amiga/search.c +++ b/amiga/search.c @@ -54,6 +54,7 @@ #include "desktop/gui_window.h" #include "desktop/gui_search.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/search.h" #include "amiga/object.h" @@ -107,7 +108,7 @@ void ami_search_open(struct gui_window *gwin) fwin = ami_misc_allocvec_clear(sizeof(struct find_window), 0); - fwin->objects[OID_MAIN] = WindowObject, + fwin->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title,messages_get("FindTextNS"), WA_Activate, TRUE, @@ -121,26 +122,21 @@ void ami_search_open(struct gui_window *gwin) WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, fwin->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, fwin->objects[GID_SEARCHSTRING] = StringObject, + WINDOW_ParentGroup, fwin->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, fwin->objects[GID_SEARCHSTRING] = StringObj, GA_ID,GID_SEARCHSTRING, GA_TabCycle,TRUE, GA_RelVerify,TRUE, StringEnd, -/* - CHILD_Label, LabelObject, - LABEL_Text,messages_get("searchstring"), - LabelEnd, -*/ CHILD_WeightedHeight,0, - LAYOUT_AddChild, fwin->objects[GID_CASE] = CheckBoxObject, + LAYOUT_AddChild, fwin->objects[GID_CASE] = CheckBoxObj, GA_ID,GID_CASE, GA_Text,messages_get("CaseSens"), GA_Selected,FALSE, GA_TabCycle,TRUE, GA_RelVerify,TRUE, CheckBoxEnd, - LAYOUT_AddChild, fwin->objects[GID_SHOWALL] = CheckBoxObject, + LAYOUT_AddChild, fwin->objects[GID_SHOWALL] = CheckBoxObj, GA_ID,GID_SHOWALL, GA_Text,messages_get("ShowAll"), GA_Selected,FALSE, @@ -148,8 +144,8 @@ void ami_search_open(struct gui_window *gwin) GA_RelVerify,TRUE, CheckBoxEnd, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, fwin->objects[GID_PREV] = ButtonObject, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, fwin->objects[GID_PREV] = ButtonObj, GA_ID,GID_PREV, GA_RelVerify,TRUE, GA_Text,messages_get("Prev"), @@ -157,7 +153,7 @@ void ami_search_open(struct gui_window *gwin) GA_Disabled,TRUE, ButtonEnd, CHILD_WeightedHeight,0, - LAYOUT_AddChild, fwin->objects[GID_NEXT] = ButtonObject, + LAYOUT_AddChild, fwin->objects[GID_NEXT] = ButtonObj, GA_ID,GID_NEXT, GA_RelVerify,TRUE, GA_Text,messages_get("Next"), diff --git a/amiga/stringview/stringview.c b/amiga/stringview/stringview.c index a91047702..e875f3b5a 100755 --- a/amiga/stringview/stringview.c +++ b/amiga/stringview/stringview.c @@ -415,7 +415,7 @@ static uint32 myStringClass_OM_New( Class *cl, Object *obj, struct opSet *msg ) data->WindowObject = NewObject( WindowClass, NULL, WA_Activate, FALSE, WA_Borderless, TRUE, - WINDOW_ParentGroup, NewObject( LAYOUT_GetClass(), NULL, + WINDOW_ParentGroup, NewObject( LayoutClass, NULL, LAYOUT_SpaceInner, FALSE, LAYOUT_SpaceOuter, FALSE, LAYOUT_AddChild, data->ListviewObject = NewObject( ListBrowserClass, NULL, @@ -844,7 +844,7 @@ uint32 ret; Class *MakeStringClass( void ) { Class *cl; - cl = MakeClass( NULL, NULL, STRING_GetClass(), sizeof(struct myStringClassData), 0 ); + cl = MakeClass( NULL, NULL, StringClass, sizeof(struct myStringClassData), 0 ); if ( cl ) { diff --git a/amiga/tree.c b/amiga/tree.c index 1785a9d28..4f2c28630 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -64,6 +64,7 @@ #include "amiga/gui.h" #include "amiga/tree.h" #include "amiga/file.h" +#include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/utf8.h" #include "amiga/sslcert.h" @@ -738,7 +739,7 @@ void ami_tree_open(struct treeview_window *twin,int type) if(type == AMI_TREE_SSLCERT) { - twin->objects[OID_MAIN] = WindowObject, + twin->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, twin->wintitle, WA_Activate, TRUE, @@ -762,22 +763,22 @@ void ami_tree_open(struct treeview_window *twin,int type) /* WINDOW_NewMenu, twin->menu, -> No menu for SSL Cert */ WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, twin->objects[GID_MAIN] = VGroupObject, + WINDOW_ParentGroup, twin->objects[GID_MAIN] = LayoutVObj, LAYOUT_AddImage, LabelObject, LABEL_Text, twin->sslerr, LabelEnd, - LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObject, + LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObj, GA_ID, GID_BROWSER, SPACE_Transparent,TRUE, SPACE_BevelStyle, BVS_DISPLAY, SpaceEnd, LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, twin->objects[GID_OPEN] = ButtonObject, + LAYOUT_AddChild, twin->objects[GID_OPEN] = ButtonObj, GA_ID,GID_OPEN, GA_Text, twin->sslaccept, GA_RelVerify,TRUE, ButtonEnd, - LAYOUT_AddChild, twin->objects[GID_CANCEL] = ButtonObject, + LAYOUT_AddChild, twin->objects[GID_CANCEL] = ButtonObj, GA_ID,GID_CANCEL, GA_Text, twin->sslreject, GA_RelVerify,TRUE, @@ -816,7 +817,7 @@ void ami_tree_open(struct treeview_window *twin,int type) height = nsoption_int(cookies_window_ysize); } - twin->objects[OID_MAIN] = WindowObject, + twin->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, twin->wintitle, WA_Activate, TRUE, @@ -843,8 +844,8 @@ void ami_tree_open(struct treeview_window *twin,int type) WINDOW_NewMenu, twin->menu, WINDOW_IconifyGadget, FALSE, // WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, twin->objects[GID_MAIN] = VGroupObject, - LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObject, + WINDOW_ParentGroup, twin->objects[GID_MAIN] = LayoutVObj, + LAYOUT_AddChild, twin->objects[GID_BROWSER] = SpaceObj, GA_ID, GID_BROWSER, SPACE_Transparent,TRUE, SPACE_BevelStyle, BVS_DISPLAY, @@ -1488,3 +1489,4 @@ struct treeview_window *ami_tree_create(int flags, return twin; } + -- cgit v1.2.3