summaryrefslogtreecommitdiff
path: root/frontends/amiga
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/amiga')
-rw-r--r--frontends/amiga/Makefile2
-rw-r--r--frontends/amiga/arexx.c9
-rw-r--r--frontends/amiga/cookies.c12
-rw-r--r--frontends/amiga/dist/Rexx/YT_download_page.nsrx21
-rw-r--r--frontends/amiga/dist/Rexx/YT_open.nsrx21
-rw-r--r--frontends/amiga/dist/Rexx/YT_play.nsrx19
-rw-r--r--frontends/amiga/download.c16
-rw-r--r--frontends/amiga/font_scan.c16
-rw-r--r--frontends/amiga/gui.c252
-rwxr-xr-xfrontends/amiga/gui_options.c760
-rw-r--r--frontends/amiga/history.c12
-rw-r--r--frontends/amiga/history_local.c12
-rw-r--r--frontends/amiga/hotlist.c12
-rw-r--r--frontends/amiga/libs.c8
-rw-r--r--frontends/amiga/libs.h2
-rw-r--r--frontends/amiga/os3support.c87
-rw-r--r--frontends/amiga/os3support.h16
-rw-r--r--frontends/amiga/pageinfo.c12
-rw-r--r--frontends/amiga/print.c64
-rw-r--r--frontends/amiga/rtg.c2
-rwxr-xr-xfrontends/amiga/search.c32
21 files changed, 678 insertions, 709 deletions
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 99745c90e..80b6f8312 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
ifneq ($(SUBTARGET),os3)
CFLAGS += -O2 -mstrict-align -finline-functions -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__
else
- CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020
+ CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -Dmc68000
endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index f937fdb17..8089857a9 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -126,14 +126,13 @@ STATIC struct ARexxCmd Commands[] =
bool ami_arexx_init(ULONG *rxsig)
{
- if((arexx_obj = ARexxObj,
+ if((arexx_obj = (ARexxObj,
AREXX_HostName,"NETSURF",
AREXX_Commands,Commands,
AREXX_NoSlot,TRUE,
AREXX_ReplyHook,NULL,
AREXX_DefExtension,"nsrx",
- End))
- {
+ End))) {
GetAttr(AREXX_SigMask, arexx_obj, rxsig);
return true;
}
@@ -141,13 +140,13 @@ bool ami_arexx_init(ULONG *rxsig)
{
/* Create a temporary ARexx port so we can send commands to the NetSurf which
* is already running */
- arexx_obj = ARexxObj,
+ arexx_obj = (ARexxObj,
AREXX_HostName,"NETSURF",
AREXX_Commands,Commands,
AREXX_NoSlot,FALSE,
AREXX_ReplyHook,NULL,
AREXX_DefExtension,"nsrx",
- End;
+ End);
return false;
}
diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c
index 3cd32f37e..86aa24214 100644
--- a/frontends/amiga/cookies.c
+++ b/frontends/amiga/cookies.c
@@ -297,7 +297,7 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win)
refresh_mode = WA_SimpleRefresh;
}
- ami_cw->objects[GID_CW_WIN] = WindowObj,
+ ami_cw->objects[GID_CW_WIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, ami_cw->wintitle,
WA_Activate, TRUE,
@@ -327,15 +327,15 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win)
WINDOW_MenuUserData, WGUD_HOOK,
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+ WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj,
GA_ID, GID_CW_DRAW,
SPACE_Transparent, TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
GA_RelVerify, TRUE,
- SpaceEnd,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndWindow);
if(ami_cw->objects[GID_CW_WIN] == NULL) {
return NSERROR_NOMEM;
diff --git a/frontends/amiga/dist/Rexx/YT_download_page.nsrx b/frontends/amiga/dist/Rexx/YT_download_page.nsrx
new file mode 100644
index 000000000..fdc06923d
--- /dev/null
+++ b/frontends/amiga/dist/Rexx/YT_download_page.nsrx
@@ -0,0 +1,21 @@
+/* YT play.nsrx by Chris Handley
+ This script shows download links for a YouTube video using YT (OS4Depot:video/misc/yt.lha)
+*/
+
+options results
+
+if ~open('yt','AppDir:YT','R') then do
+ GETSCREENNAME
+ address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result
+ OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */
+ exit
+end
+close('yt')
+
+GETURL
+/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/
+address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'" html silent'
+
+/* Hack to activate the newest tab */
+OPEN 'file:///RAM:' NEWTAB ACTIVE
+CLOSE
diff --git a/frontends/amiga/dist/Rexx/YT_open.nsrx b/frontends/amiga/dist/Rexx/YT_open.nsrx
new file mode 100644
index 000000000..4454f0c29
--- /dev/null
+++ b/frontends/amiga/dist/Rexx/YT_open.nsrx
@@ -0,0 +1,21 @@
+/* YT play.nsrx by Chris Handley
+ This script opens a YouTube video using YT (OS4Depot:video/misc/yt.lha)
+*/
+
+options results
+
+if ~open('yt','AppDir:YT','R') then do
+ GETSCREENNAME
+ address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result
+ OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */
+ exit
+end
+close('yt')
+
+address COMMAND 'Run >NIL: RequestChoice Title="NetSurf" BODY="When finished with YT, click OK to return to NetSurf" GADGETS="OK" INACTIVE >NIL:' /* Hack to get Workbench to front */
+
+GETURL
+/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/
+address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'"'
+
+/*TOBACK*/ /* ideally we'd bring Workbench to front */
diff --git a/frontends/amiga/dist/Rexx/YT_play.nsrx b/frontends/amiga/dist/Rexx/YT_play.nsrx
new file mode 100644
index 000000000..a8e29162f
--- /dev/null
+++ b/frontends/amiga/dist/Rexx/YT_play.nsrx
@@ -0,0 +1,19 @@
+/* YT play.nsrx by Chris Handley
+ This script auto-plays a YouTube video using YT (OS4Depot:video/misc/yt.lha)
+*/
+
+options results
+
+if ~open('yt','AppDir:YT','R') then do
+ GETSCREENNAME
+ address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result
+ OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */
+ exit
+end
+close('yt')
+
+GETURL
+/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/
+address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'" AutoPlay'
+
+/*TOBACK*/ /* ideally we'd bring Workbench to front */
diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c
index cb9e99785..5bf430165 100644
--- a/frontends/amiga/download.c
+++ b/frontends/amiga/download.c
@@ -191,7 +191,7 @@ static struct gui_download_window *gui_download_window_create(download_context *
APPNOTIFY_StopBackMsg, bkm,
TAG_DONE);
} else {
- dw->objects[OID_D_MAIN] = WindowObj,
+ dw->objects[OID_D_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, dw->url,
WA_Activate, TRUE,
@@ -205,8 +205,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_D_MAIN] = LayoutVObj,
- LAYOUT_AddChild, dw->objects[GID_D_STATUS] = FuelGaugeObj,
+ WINDOW_ParentGroup, dw->objects[GID_D_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, dw->objects[GID_D_STATUS] = (FuelGaugeObj,
GA_ID,GID_D_STATUS,
GA_Text,messages_get("amiDownload"),
FUELGAUGE_Min,0,
@@ -217,17 +217,17 @@ static struct gui_download_window *gui_download_window_create(download_context *
FUELGAUGE_VarArgs,va,
FUELGAUGE_Percent,FALSE,
FUELGAUGE_Justification,FGJ_CENTER,
- FuelGaugeEnd,
+ FuelGaugeEnd),
CHILD_NominalSize,TRUE,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, dw->objects[GID_D_CANCEL] = ButtonObj,
+ LAYOUT_AddChild, dw->objects[GID_D_CANCEL] = (ButtonObj,
GA_ID,GID_D_CANCEL,
GA_RelVerify,TRUE,
GA_Text,messages_get("Abort"),
GA_TabCycle,TRUE,
- ButtonEnd,
- EndGroup,
- EndWindow;
+ ButtonEnd),
+ EndGroup),
+ EndWindow);
dw->win = (struct Window *)RA_OpenWindow(dw->objects[OID_D_MAIN]);
}
diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c
index d7f970be1..5e8707cef 100644
--- a/frontends/amiga/font_scan.c
+++ b/frontends/amiga/font_scan.c
@@ -106,7 +106,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] = WindowObj,
+ fsw->objects[FS_OID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, fsw->title,
WA_Activate, TRUE,
@@ -121,8 +121,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] = LayoutVObj,
- LAYOUT_AddChild, fsw->objects[FS_GID_FONTS] = FuelGaugeObj,
+ 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,
@@ -132,10 +132,10 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts)
FUELGAUGE_ShortTicks, TRUE,
FUELGAUGE_Percent, FALSE,
FUELGAUGE_Justification, FGJ_CENTER,
- FuelGaugeEnd,
+ FuelGaugeEnd),
CHILD_NominalSize, TRUE,
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = FuelGaugeObj,
+ LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = (FuelGaugeObj,
GA_ID, FS_GID_GLYPHS,
//GA_Text, "Glyphs",
FUELGAUGE_Min, 0x0000,
@@ -145,11 +145,11 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts)
FUELGAUGE_ShortTicks, TRUE,
FUELGAUGE_Percent, FALSE,
FUELGAUGE_Justification, FGJ_CENTER,
- FuelGaugeEnd,
+ FuelGaugeEnd),
CHILD_NominalSize, TRUE,
CHILD_WeightedHeight, 0,
- EndGroup,
- EndWindow;
+ EndGroup),
+ EndWindow);
fsw->win = (struct Window *)RA_OpenWindow(fsw->objects[FS_OID_MAIN]);
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 8eb34fb92..2c4b31511 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -2119,12 +2119,12 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin)
attrs[1].ti_Tag = TAG_DONE;
attrs[1].ti_Data = 0;
- gwin->objects[GID_HSCROLL] = ScrollerObj,
+ gwin->objects[GID_HSCROLL] = (ScrollerObj,
GA_ID, GID_HSCROLL,
GA_RelVerify, TRUE,
SCROLLER_Orientation, SORIENT_HORIZ,
ICA_TARGET, ICTARGET_IDCMP,
- ScrollerEnd;
+ ScrollerEnd);
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HSCROLL], attrs);
@@ -2165,11 +2165,11 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin)
attrs[1].ti_Tag = TAG_DONE;
attrs[1].ti_Data = 0;
- gwin->objects[GID_VSCROLL] = ScrollerObj,
+ gwin->objects[GID_VSCROLL] = (ScrollerObj,
GA_ID, GID_VSCROLL,
GA_RelVerify, TRUE,
ICA_TARGET, ICTARGET_IDCMP,
- ScrollerEnd;
+ ScrollerEnd);
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_VSCROLL], attrs);
@@ -2277,13 +2277,13 @@ static void ami_gui_console_log_add(struct gui_window *g)
attrs[1].ti_Tag = TAG_DONE;
attrs[1].ti_Data = 0;
- g->shared->objects[GID_LOG] = ListBrowserObj,
+ g->shared->objects[GID_LOG] = (ListBrowserObj,
GA_ID, GID_LOG,
LISTBROWSER_ColumnInfo, g->logcolumns,
LISTBROWSER_ColumnTitles, TRUE,
LISTBROWSER_Labels, &g->loglist,
LISTBROWSER_Striping, LBS_ROWS,
- ListBrowserEnd;
+ ListBrowserEnd);
#ifdef __amigaos4__
IDoMethod(g->shared->objects[GID_LOGLAYOUT], LM_ADDCHILD,
@@ -4023,12 +4023,12 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item,
if (iconname == NULL) iconname = ASPrintf("icons/content.png");
ami_locate_resource(menu_icon, iconname);
- tb_userdata->gw->hotlist_toolbar_lab[item] = BitMapObj,
+ tb_userdata->gw->hotlist_toolbar_lab[item] = (BitMapObj,
IA_Scalable, TRUE,
BITMAP_Screen, scrn,
BITMAP_SourceFile, menu_icon,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
/* \todo make this scale the bitmap to these dimensions */
SetAttrs(tb_userdata->gw->hotlist_toolbar_lab[item],
@@ -4036,13 +4036,13 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item,
BITMAP_Height, 16,
TAG_DONE);
- Object *lab_item = LabelObj,
+ Object *lab_item = (LabelObj,
// LABEL_DrawInfo, dri,
LABEL_DisposeImage, TRUE,
LABEL_Image, tb_userdata->gw->hotlist_toolbar_lab[item],
LABEL_Text, " ",
LABEL_Text, utf8title,
- LabelEnd;
+ LabelEnd);
free(utf8title);
@@ -4082,18 +4082,18 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) {
gwin->objects[GID_HOTLIST] =
- SpeedBarObj,
+ (SpeedBarObj,
GA_ID, GID_HOTLIST,
GA_RelVerify, TRUE,
ICA_TARGET, ICTARGET_IDCMP,
SPEEDBAR_BevelStyle, BVS_NONE,
SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list,
- SpeedBarEnd;
+ SpeedBarEnd);
gwin->objects[GID_HOTLISTSEPBAR] =
- BevelObj,
+ (BevelObj,
BEVEL_Style, BVS_SBAR_VERT,
- BevelEnd;
+ BevelEnd);
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HOTLIST], attrs);
@@ -4228,7 +4228,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
attrs[2].ti_Tag = TAG_DONE;
attrs[2].ti_Data = 0;
- gwin->objects[GID_TABS] = ClickTabObj,
+ gwin->objects[GID_TABS] = (ClickTabObj,
GA_ID, GID_TABS,
GA_RelVerify, TRUE,
GA_Underscore, 13, // disable kb shortcuts
@@ -4237,15 +4237,15 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
CLICKTAB_LabelTruncate, TRUE,
CLICKTAB_CloseImage, gwin->objects[GID_CLOSETAB_BM],
CLICKTAB_FlagImage, gwin->objects[GID_TABS_FLAG],
- ClickTabEnd;
+ ClickTabEnd);
- gwin->objects[GID_ADDTAB] = ButtonObj,
+ gwin->objects[GID_ADDTAB] = (ButtonObj,
GA_ID, GID_ADDTAB,
GA_RelVerify, TRUE,
GA_HintInfo, gwin->helphints[GID_ADDTAB],
GA_Text, "+",
BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
- ButtonEnd;
+ ButtonEnd);
#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_TABS], NULL);
@@ -4970,101 +4970,101 @@ gui_window_create(struct browser_window *bw,
ami_get_theme_filename(pi_secure, "theme_pageinfo_secure", false);
ami_get_theme_filename(pi_warning, "theme_pageinfo_warning", false);
- g->shared->objects[GID_FAVE_ADD] = BitMapObj,
+ g->shared->objects[GID_FAVE_ADD] = (BitMapObj,
BITMAP_SourceFile, fave,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_FAVE_RMV] = BitMapObj,
+ g->shared->objects[GID_FAVE_RMV] = (BitMapObj,
BITMAP_SourceFile, unfave,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_ADDTAB_BM] = BitMapObj,
+ g->shared->objects[GID_ADDTAB_BM] = (BitMapObj,
BITMAP_SourceFile, addtab,
BITMAP_SelectSourceFile, addtab_s,
BITMAP_DisabledSourceFile, addtab_g,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_CLOSETAB_BM] = BitMapObj,
+ g->shared->objects[GID_CLOSETAB_BM] = (BitMapObj,
BITMAP_SourceFile, closetab,
BITMAP_SelectSourceFile, closetab_s,
BITMAP_DisabledSourceFile, closetab_g,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_PAGEINFO_INSECURE_BM] = BitMapObj,
+ g->shared->objects[GID_PAGEINFO_INSECURE_BM] = (BitMapObj,
BITMAP_SourceFile, pi_insecure,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = BitMapObj,
+ g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = (BitMapObj,
BITMAP_SourceFile, pi_internal,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_PAGEINFO_LOCAL_BM] = BitMapObj,
+ g->shared->objects[GID_PAGEINFO_LOCAL_BM] = (BitMapObj,
BITMAP_SourceFile, pi_local,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_PAGEINFO_SECURE_BM] = BitMapObj,
+ g->shared->objects[GID_PAGEINFO_SECURE_BM] = (BitMapObj,
BITMAP_SourceFile, pi_secure,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
- g->shared->objects[GID_PAGEINFO_WARNING_BM] = BitMapObj,
+ g->shared->objects[GID_PAGEINFO_WARNING_BM] = (BitMapObj,
BITMAP_SourceFile, pi_warning,
BITMAP_Screen, scrn,
BITMAP_Masking, TRUE,
- BitMapEnd;
+ BitMapEnd);
if(ClickTabBase->lib_Version < 53)
{
addtabclosegadget = LAYOUT_AddChild;
- g->shared->objects[GID_CLOSETAB] = ButtonObj,
+ g->shared->objects[GID_CLOSETAB] = (ButtonObj,
GA_ID, GID_CLOSETAB,
GA_RelVerify, TRUE,
BUTTON_RenderImage, g->shared->objects[GID_CLOSETAB_BM],
- ButtonEnd;
+ ButtonEnd);
- g->shared->objects[GID_TABS] = ClickTabObj,
+ g->shared->objects[GID_TABS] = (ClickTabObj,
GA_ID,GID_TABS,
GA_RelVerify,TRUE,
GA_Underscore,13, // disable kb shortcuts
CLICKTAB_Labels,&g->shared->tab_list,
CLICKTAB_LabelTruncate,TRUE,
- ClickTabEnd;
+ ClickTabEnd);
- g->shared->objects[GID_ADDTAB] = ButtonObj,
+ g->shared->objects[GID_ADDTAB] = (ButtonObj,
GA_ID, GID_ADDTAB,
GA_RelVerify, TRUE,
GA_Text, "+",
BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM],
- ButtonEnd;
+ ButtonEnd);
}
else
{
- g->shared->objects[GID_TABS_FLAG] = BitMapObj,
+ g->shared->objects[GID_TABS_FLAG] = (BitMapObj,
BITMAP_SourceFile, tabthrobber,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd;
+ BitMapEnd);
}
NSLOG(netsurf, INFO, "Creating window object");
- g->shared->objects[OID_MAIN] = WindowObj,
+ g->shared->objects[OID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Activate, TRUE,
WA_DepthGadget, TRUE,
@@ -5097,109 +5097,109 @@ gui_window_create(struct browser_window *bw,
WINDOW_BuiltInScroll, TRUE,
WINDOW_GadgetHelp, TRUE,
WINDOW_UserData, g->shared,
- WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutVObj,
+ WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutVObj,
LAYOUT_DeferLayout, defer_layout,
LAYOUT_SpaceOuter, TRUE,
- LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = LayoutHObj,
+ LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = (LayoutHObj,
LAYOUT_VertAlignment, LALIGN_CENTER,
- LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_BACK] = (ButtonObj,
GA_ID, GID_BACK,
GA_RelVerify, TRUE,
GA_Disabled, TRUE,
GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_BACK, g->shared),
GA_HintInfo, g->shared->helphints[GID_BACK],
- BUTTON_RenderImage,BitMapObj,
+ BUTTON_RenderImage,(BitMapObj,
BITMAP_SourceFile,nav_west,
BITMAP_SelectSourceFile,nav_west_s,
BITMAP_DisabledSourceFile,nav_west_g,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd,
- ButtonEnd,
+ BitMapEnd),
+ ButtonEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = (ButtonObj,
GA_ID, GID_FORWARD,
GA_RelVerify, TRUE,
GA_Disabled, TRUE,
GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_FORWARD, g->shared),
GA_HintInfo, g->shared->helphints[GID_FORWARD],
- BUTTON_RenderImage,BitMapObj,
+ BUTTON_RenderImage,(BitMapObj,
BITMAP_SourceFile,nav_east,
BITMAP_SelectSourceFile,nav_east_s,
BITMAP_DisabledSourceFile,nav_east_g,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd,
- ButtonEnd,
+ BitMapEnd),
+ ButtonEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_STOP] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_STOP] = (ButtonObj,
GA_ID,GID_STOP,
GA_RelVerify,TRUE,
GA_HintInfo, g->shared->helphints[GID_STOP],
- BUTTON_RenderImage,BitMapObj,
+ BUTTON_RenderImage,(BitMapObj,
BITMAP_SourceFile,stop,
BITMAP_SelectSourceFile,stop_s,
BITMAP_DisabledSourceFile,stop_g,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd,
- ButtonEnd,
+ BitMapEnd),
+ ButtonEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = (ButtonObj,
GA_ID,GID_RELOAD,
GA_RelVerify,TRUE,
GA_HintInfo, g->shared->helphints[GID_RELOAD],
- BUTTON_RenderImage,BitMapObj,
+ BUTTON_RenderImage,(BitMapObj,
BITMAP_SourceFile,reload,
BITMAP_SelectSourceFile,reload_s,
BITMAP_DisabledSourceFile,reload_g,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd,
- ButtonEnd,
+ BitMapEnd),
+ ButtonEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_HOME] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_HOME] = (ButtonObj,
GA_ID,GID_HOME,
GA_RelVerify,TRUE,
GA_HintInfo, g->shared->helphints[GID_HOME],
- BUTTON_RenderImage,BitMapObj,
+ BUTTON_RenderImage,(BitMapObj,
BITMAP_SourceFile,home,
BITMAP_SelectSourceFile,home_s,
BITMAP_DisabledSourceFile,home_g,
BITMAP_Screen,scrn,
BITMAP_Masking,TRUE,
- BitMapEnd,
- ButtonEnd,
+ BitMapEnd),
+ ButtonEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutHObj, // FavIcon, URL bar and hotlist star
+ LAYOUT_AddChild, (LayoutHObj, // FavIcon, URL bar and hotlist star
LAYOUT_VertAlignment, LALIGN_CENTER,
- LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObj,
+ LAYOUT_AddChild, g->shared->objects[GID_ICON] = (SpaceObj,
GA_ID, GID_ICON,
SPACE_MinWidth, 16,
SPACE_MinHeight, 16,
SPACE_Transparent, TRUE,
// SPACE_RenderHook, &g->shared->favicon_hook,
- SpaceEnd,
+ SpaceEnd),
CHILD_WeightedWidth, 0,
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = ButtonObj,
+ LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = (ButtonObj,
GA_ID, GID_PAGEINFO,
GA_RelVerify, TRUE,
GA_ReadOnly, FALSE,
BUTTON_RenderImage, g->shared->objects[GID_PAGEINFO_INTERNAL_BM],
- ButtonEnd,
+ ButtonEnd),
CHILD_WeightedWidth, 0,
CHILD_WeightedHeight, 0,
LAYOUT_AddChild, g->shared->objects[GID_URL] =
#ifdef __amigaos4__
NewObject(urlStringClass, NULL,
#else
- StringObj,
+ (StringObj,
#endif
STRINGA_MaxChars, 2000,
GA_ID, GID_URL,
@@ -5210,59 +5210,59 @@ gui_window_create(struct browser_window *bw,
#ifdef __amigaos4__
STRINGVIEW_Header, URLHistory_GetList(),
#endif
- TAG_DONE),
- LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObj,
+ TAG_DONE)),
+ LAYOUT_AddChild, g->shared->objects[GID_FAVE] = (ButtonObj,
GA_ID, GID_FAVE,
GA_RelVerify, TRUE,
// GA_HintInfo, g->shared->helphints[GID_FAVE],
BUTTON_RenderImage, g->shared->objects[GID_FAVE_ADD],
- ButtonEnd,
+ ButtonEnd),
CHILD_WeightedWidth, 0,
CHILD_WeightedHeight, 0,
- LayoutEnd,
+ LayoutEnd),
// GA_ID, GID_TOOLBARLAYOUT,
// GA_RelVerify, TRUE,
// LAYOUT_RelVerify, TRUE,
LAYOUT_WeightBar, TRUE,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_VertAlignment, LALIGN_CENTER,
- LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObj,
+ LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = (ChooserObj,
GA_ID, GID_SEARCH_ICON,
GA_RelVerify, TRUE,
CHOOSER_DropDown, TRUE,
CHOOSER_Labels, g->shared->web_search_list,
CHOOSER_MaxLabels, 40, /* Same as options GUI */
- ChooserEnd,
+ ChooserEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = StringObj,
+ LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = (StringObj,
GA_ID,GID_SEARCHSTRING,
STRINGA_TextVal, NULL,
GA_RelVerify,TRUE,
GA_HintInfo, g->shared->helphints[GID_SEARCHSTRING],
- StringEnd,
- LayoutEnd,
+ StringEnd),
+ LayoutEnd),
CHILD_WeightedWidth, nsoption_int(web_search_width),
- LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = SpaceObj,
+ LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = (SpaceObj,
GA_ID,GID_THROBBER,
SPACE_MinWidth, ami_theme_throbber_get_width(),
SPACE_MinHeight, ami_theme_throbber_get_height(),
SPACE_Transparent,TRUE,
// SPACE_RenderHook, &g->shared->throbber_hook,
- SpaceEnd,
+ SpaceEnd),
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LayoutEnd,
+ LayoutEnd),
CHILD_WeightedHeight,0,
- LAYOUT_AddImage, BevelObj,
+ LAYOUT_AddImage, (BevelObj,
BEVEL_Style, BVS_SBAR_VERT,
- BevelEnd,
+ BevelEnd),
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = LayoutVObj,
+ LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = (LayoutVObj,
LAYOUT_SpaceInner, FALSE,
- LayoutEnd,
+ LayoutEnd),
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = LayoutHObj,
+ LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = (LayoutHObj,
LAYOUT_SpaceInner,FALSE,
addtabclosegadget, g->shared->objects[GID_CLOSETAB],
CHILD_WeightedWidth,0,
@@ -5274,35 +5274,35 @@ gui_window_create(struct browser_window *bw,
addtabclosegadget, g->shared->objects[GID_ADDTAB],
CHILD_WeightedWidth,0,
CHILD_WeightedHeight,0,
- LayoutEnd,
+ LayoutEnd),
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj,
- LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj,
+ LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj,
GA_ID,GID_BROWSER,
SPACE_Transparent,TRUE,
SPACE_RenderHook, &g->shared->browser_hook,
- SpaceEnd,
- EndGroup,
- EndGroup,
- EndGroup,
+ SpaceEnd),
+ EndGroup),
+ EndGroup),
+ EndGroup),
// LAYOUT_WeightBar, TRUE,
- LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = LayoutVObj,
- EndGroup,
+ LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = (LayoutVObj,
+ EndGroup),
CHILD_WeightedHeight, 0,
#ifndef __amigaos4__
- LAYOUT_AddChild, g->shared->objects[GID_STATUS] = StringObj,
+ LAYOUT_AddChild, g->shared->objects[GID_STATUS] = (StringObj,
GA_ID, GID_STATUS,
GA_ReadOnly, TRUE,
STRINGA_TextVal, NULL,
GA_RelVerify, TRUE,
- StringEnd,
+ StringEnd),
#endif
- EndGroup,
- EndGroup,
- EndWindow;
+ EndGroup),
+ EndGroup),
+ EndWindow);
}
else
{
@@ -5311,7 +5311,7 @@ gui_window_create(struct browser_window *bw,
g->shared->tabs = 0;
g->tab_node = NULL;
- g->shared->objects[OID_MAIN] = WindowObj,
+ g->shared->objects[OID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Activate, TRUE,
WA_DepthGadget, FALSE,
@@ -5338,19 +5338,19 @@ gui_window_create(struct browser_window *bw,
WINDOW_SharedPort,sport,
WINDOW_UserData,g->shared,
WINDOW_BuiltInScroll,TRUE,
- WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutHObj,
+ WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutHObj,
LAYOUT_DeferLayout, defer_layout,
LAYOUT_SpaceOuter, TRUE,
- LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj,
- LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj,
- LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj,
+ LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj,
+ LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj,
+ LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj,
GA_ID,GID_BROWSER,
SPACE_Transparent,TRUE,
- SpaceEnd,
- EndGroup,
- EndGroup,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndGroup),
+ EndGroup),
+ EndWindow);
}
NSLOG(netsurf, INFO, "Opening window");
@@ -6032,14 +6032,14 @@ static nserror gui_search_web_provider_update(const char *provider_name,
bm_masking_tag = BITMAP_Masking;
}
- gwin->search_bm = BitMapObj,
+ gwin->search_bm = (BitMapObj,
BITMAP_Screen, scrn,
BITMAP_Width, 16,
BITMAP_Height, 16,
BITMAP_BitMap, bm,
BITMAP_HasAlpha, TRUE,
bm_masking_tag, TRUE,
- BitMapEnd;
+ BitMapEnd);
RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON],
gwin->win, NULL,
@@ -6228,7 +6228,7 @@ static Object *ami_gui_splash_open(void)
struct TextAttr tattr;
struct TextFont *tfont;
- win_obj = WindowObj,
+ win_obj = (WindowObj,
#ifdef __amigaos4__
WA_ToolBox, TRUE,
#endif
@@ -6237,14 +6237,14 @@ static Object *ami_gui_splash_open(void)
WINDOW_Position, WPOS_CENTERSCREEN,
WINDOW_LockWidth, TRUE,
WINDOW_LockHeight, TRUE,
- WINDOW_ParentGroup, LayoutVObj,
- LAYOUT_AddImage, bm_obj = BitMapObj,
+ WINDOW_ParentGroup, (LayoutVObj,
+ LAYOUT_AddImage, bm_obj = (BitMapObj,
BITMAP_SourceFile, "PROGDIR:Resources/splash.png",
BITMAP_Screen, wbscreen,
BITMAP_Precision, PRECISION_IMAGE,
- BitMapEnd,
- LayoutEnd,
- EndWindow;
+ BitMapEnd),
+ LayoutEnd),
+ EndWindow);
if(win_obj == NULL) {
NSLOG(netsurf, INFO, "Splash window object not created");
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index fa8cdee35..1bd1015fd 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -641,7 +641,7 @@ void ami_gui_opts_open(void)
ami_gui_opts_setup(gow);
- gow->objects[OID_MAIN] = WindowObj,
+ gow->objects[OID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, gadlab[LAB_OPTS_WINTITLE],
WA_Activate, TRUE,
@@ -655,154 +655,154 @@ 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] = LayoutVObj,
- LAYOUT_AddChild, ClickTabObj,
+ WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, (ClickTabObj,
GA_RelVerify, TRUE,
#ifdef __amigaos4__
GA_Text, tabs,
#else
CLICKTAB_Labels, &gow->clicktablist,
#endif
- CLICKTAB_PageGroup, PageObj,
+ CLICKTAB_PageGroup, (PageObj,
/*
** General
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = StringObj,
+ 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, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_HOMEPAGE],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObj,
+ LabelEnd),
+ 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] = ButtonObj,
+ ButtonEnd),
+ 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] = ButtonObj,
+ ButtonEnd),
+ 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,
- ButtonEnd,
- LayoutEnd,
- LayoutEnd, //homepage
+ ButtonEnd),
+ LayoutEnd),
+ LayoutEnd), //homepage
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = CheckBoxObj,
+ 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, LayoutVObj,
+ CheckBoxEnd),
+ LayoutEnd), // content blocking
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_CONTENTLANGUAGE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObj,
+ 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] = CheckBoxObj,
+ StringEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = (CheckBoxObj,
GA_ID, GID_OPTS_FROMLOCALE,
GA_Text, gadlab[GID_OPTS_FROMLOCALE],
GA_RelVerify, TRUE,
GA_Selected, nsoption_bool(accept_lang_locale),
- ButtonEnd,
+ CheckBoxEnd),
// CHILD_WeightedWidth, 0,
- LayoutEnd, // content language
- LayoutEnd, // content
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LayoutEnd), // content language
+ LayoutEnd), // content
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_HISTORY],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = (IntegerObj,
GA_ID, GID_OPTS_HISTORY,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(expire_url),
INTEGER_Minimum, 0,
INTEGER_Maximum, 366,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_DAYS],
- LabelEnd,
- LayoutEnd,
+ LabelEnd),
+ LayoutEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_HISTORY],
- LabelEnd,
- LayoutEnd, // history
- LAYOUT_AddChild, LayoutVObj,
+ LabelEnd),
+ LayoutEnd), // history
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCRIPTING],
- LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = (CheckBoxObj,
GA_ID, GID_OPTS_JAVASCRIPT,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_JAVASCRIPT],
GA_Selected, nsoption_bool(enable_javascript),
- CheckBoxEnd,
- LayoutEnd, // scripting
- LayoutEnd,
+ CheckBoxEnd),
+ LayoutEnd), // scripting
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_PRIVACY],
- LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObj,
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = (CheckBoxObj,
GA_ID, GID_OPTS_DONOTTRACK,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_DONOTTRACK],
GA_Selected, nsoption_bool(do_not_track),
- CheckBoxEnd,
- LayoutEnd, // misc
+ CheckBoxEnd),
+ LayoutEnd), // misc
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // pageadd
+ PageEnd), // pageadd
/*
** Display
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCREEN],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = (RadioButtonObj,
GA_ID, GID_OPTS_SCREEN,
GA_RelVerify, TRUE,
#ifdef __amigaos4__
@@ -811,91 +811,91 @@ void ami_gui_opts_open(void)
RADIOBUTTON_Labels, &gow->screenoptslist,
#endif
RADIOBUTTON_Selected, screenoptsselected,
- RadioButtonEnd,
+ RadioButtonEnd),
CHILD_WeightedWidth,0,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = (GetScreenModeObj,
GA_ID, GID_OPTS_SCREENMODE,
GA_RelVerify, TRUE,
GA_Disabled,screenmodedisabled,
GETSCREENMODE_DisplayID,screenmodeid,
GETSCREENMODE_MinDepth, 0,
GETSCREENMODE_MaxDepth, 32,
- GetScreenModeEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObj,
+ GetScreenModeEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = (StringObj,
GA_ID, GID_OPTS_SCREENNAME,
GA_RelVerify, TRUE,
GA_Disabled,screennamedisabled,
STRINGA_TextVal, nsoption_charp(pubscreen_name),
STRINGA_BufferPos,0,
- StringEnd,
- LayoutEnd,
+ StringEnd),
+ LayoutEnd),
CHILD_WeightedHeight,0,
- LayoutEnd,
- LayoutEnd, // screen
+ LayoutEnd),
+ LayoutEnd), // screen
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_WINDOW],
- LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObj,
+ 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],
GA_Selected, nsoption_bool(window_simple_refresh),
- CheckBoxEnd,
- LayoutEnd, // window
+ CheckBoxEnd),
+ LayoutEnd), // window
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_THEME],
- LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = (GetFileObj,
GA_ID, GID_OPTS_THEME,
GA_RelVerify, TRUE,
GETFILE_Drawer, nsoption_charp(theme),
GETFILE_DrawersOnly, TRUE,
GETFILE_ReadOnly, TRUE,
GETFILE_FullFileExpand, FALSE,
- GetFileEnd,
- LayoutEnd, // theme
+ GetFileEnd),
+ LayoutEnd), // theme
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MOUSE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = (CheckBoxObj,
GA_ID, GID_OPTS_PTRTRUE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTRTRUE],
GA_Selected, nsoption_bool(truecolour_mouse_pointers),
GA_Disabled, ptr_disable,
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = (CheckBoxObj,
GA_ID, GID_OPTS_PTROS,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTROS],
GA_Selected, nsoption_bool(os_mouse_pointers),
GA_Disabled, ptr_disable,
- CheckBoxEnd,
- LayoutEnd, // mouse
+ CheckBoxEnd),
+ LayoutEnd), // mouse
CHILD_WeightedHeight,0,
- LAYOUT_AddImage, LabelObj,
+ LAYOUT_AddImage, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_RESTART],
- LabelEnd,
- LayoutEnd, // page vgroup
+ LabelEnd),
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // pageadd
+ PageEnd), // pageadd
/*
** Network
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = (ChooserObj,
GA_ID, GID_OPTS_PROXY,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -905,19 +905,19 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->proxyoptslist,
#endif
CHOOSER_Selected, proxytype,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObj,
+ LabelEnd),
+ 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] = IntegerObj,
+ StringEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = (IntegerObj,
GA_ID, GID_OPTS_PROXY_PORT,
GA_RelVerify, TRUE,
GA_Disabled, proxyhostdisabled,
@@ -925,103 +925,103 @@ void ami_gui_opts_open(void)
INTEGER_Minimum, 1,
INTEGER_Maximum, 65535,
INTEGER_Arrows, FALSE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, ":",
- LabelEnd,
- LayoutEnd, //host:port group
+ LabelEnd),
+ LayoutEnd), //host:port group
CHILD_WeightedHeight, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_HOST],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObj,
+ LabelEnd),
+ 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, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_USER],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObj,
+ LabelEnd),
+ 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, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_PASS],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = StringObj,
+ LabelEnd),
+ 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, LabelObj,
+ StringEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS],
- LabelEnd,
- LayoutEnd, // proxy
+ LabelEnd),
+ LayoutEnd), // proxy
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_FETCHING],
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = (IntegerObj,
GA_ID, GID_OPTS_FETCHMAX,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_fetchers),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHMAX],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = (IntegerObj,
GA_ID, GID_OPTS_FETCHHOST,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_fetchers_per_host),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHHOST],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = (IntegerObj,
GA_ID, GID_OPTS_FETCHCACHE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(max_cached_fetch_handles),
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FETCHCACHE],
- LabelEnd,
- LayoutEnd,
+ LabelEnd),
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Rendering
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = (ChooserObj,
GA_ID, GID_OPTS_NATIVEBM,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -1031,11 +1031,11 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->nativebmoptslist,
#endif
CHOOSER_Selected, nsoption_int(cache_bitmaps),
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_NATIVEBM],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = (ChooserObj,
GA_ID, GID_OPTS_DITHERQ,
GA_RelVerify, TRUE,
GA_Disabled, ditherdisable,
@@ -1046,38 +1046,38 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->ditheroptslist,
#endif
CHOOSER_Selected, nsoption_int(dither_quality),
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DITHERQ],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = (CheckBoxObj,
GA_ID, GID_OPTS_SCALEQ,
GA_Disabled, scaledisabled,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_SCALEQ],
GA_Selected, scaleselected,
- CheckBoxEnd,
- LayoutEnd, // images
+ CheckBoxEnd),
+ LayoutEnd), // images
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
- LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = (CheckBoxObj,
GA_ID, GID_OPTS_ANIMDISABLE,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_ANIMDISABLE],
GA_Selected, disableanims,
- CheckBoxEnd,
- LayoutEnd, //animations
+ CheckBoxEnd),
+ LayoutEnd), //animations
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DPI],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = (IntegerObj,
GA_ID, GID_OPTS_DPI_Y,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(screen_ydpi),
@@ -1085,81 +1085,81 @@ void ami_gui_opts_open(void)
INTEGER_Maximum, 200,
INTEGER_Arrows, TRUE,
GA_Disabled, nsoption_bool(bitmap_fonts),
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_DPI],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DPI_Y],
- LabelEnd,
- LayoutEnd, //animations
+ LabelEnd),
+ LayoutEnd), //animations
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Fonts
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = GetFontObj,
+ 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, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SANS],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObj,
+ LabelEnd),
+ 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, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SERIF],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = (GetFontObj,
GA_ID, GID_OPTS_FONT_MONO,
GA_RelVerify, TRUE,
GETFONT_TextAttr, &fontmono,
GETFONT_OTagOnly, TRUE,
GETFONT_ScalableOnly, TRUE,
GETFONT_FixedWidthOnly, TRUE,
- GetFontEnd,
- CHILD_Label, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_MONO],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObj,
+ LabelEnd),
+ 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, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_CURSIVE],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObj,
+ LabelEnd),
+ 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, LabelObj,
+ GetFontEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY],
- LabelEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObj,
+ LabelEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = (ChooserObj,
GA_ID, GID_OPTS_FONT_DEFAULT,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
@@ -1169,59 +1169,59 @@ void ami_gui_opts_open(void)
CHOOSER_Labels, &gow->fontoptslist,
#endif
CHOOSER_Selected, nsoption_int(font_default) - PLOT_FONT_FAMILY_SANS_SERIF,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_DEFAULT],
- LabelEnd,
- LayoutEnd, // font faces
+ LabelEnd),
+ LayoutEnd), // font faces
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObj,
+ 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,
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_PT],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObj,
+ 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,
INTEGER_Minimum, 1,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_PT],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
- LabelEnd,
- LayoutEnd,
- LAYOUT_AddChild, LayoutVObj,
+ LabelEnd),
+ LayoutEnd),
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MISC],
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObj,
+ 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],
@@ -1229,141 +1229,141 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
+ CheckBoxEnd),
#ifndef __amigaos4__
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = (CheckBoxObj,
GA_ID, GID_OPTS_FONT_BITMAP,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_FONT_BITMAP],
GA_Selected, nsoption_bool(bitmap_fonts),
- CheckBoxEnd,
+ CheckBoxEnd),
#endif
- LayoutEnd,
- LayoutEnd,
+ LayoutEnd),
+ LayoutEnd),
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Cache
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MEMCACHE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObj,
+ 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,
INTEGER_Minimum, 0,
INTEGER_Maximum, 2048,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MB],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_CACHE_MEM],
- LabelEnd,
- LayoutEnd, // memory cache
+ LabelEnd),
+ LayoutEnd), // memory cache
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DISCCACHE],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObj,
+ 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,
INTEGER_Minimum, 0,
INTEGER_Maximum, 4096,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MB],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_CACHE_DISC],
- LabelEnd,
- LayoutEnd, // disc cache
+ LabelEnd),
+ LayoutEnd), // disc cache
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Tabs
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = CheckBoxObj,
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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),
GA_Disabled, tab_always_show_disabled,
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj,
+ CheckBoxEnd),
+ 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],
GA_Selected, nsoption_bool(tab_close_warn),
- CheckBoxEnd,
- LayoutEnd, // tabbed browsing
- LayoutEnd,
- LayoutEnd, // page vgroup
+ CheckBoxEnd),
+ LayoutEnd), // tabbed browsing
+ LayoutEnd),
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Advanced
*/
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_DOWNLOADS],
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObj,
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = (CheckBoxObj,
GA_ID, GID_OPTS_OVERWRITE,
GA_RelVerify, TRUE,
GA_Disabled, FALSE,
GA_Text, gadlab[GID_OPTS_OVERWRITE],
GA_Selected, nsoption_bool(ask_overwrite),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = (CheckBoxObj,
GA_ID, GID_OPTS_NOTIFY,
GA_RelVerify, TRUE,
GA_Disabled, download_notify_disabled,
@@ -1372,39 +1372,39 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
- LayoutEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObj,
+ CheckBoxEnd),
+ LayoutEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = (GetFileObj,
GA_ID, GID_OPTS_DLDIR,
GA_RelVerify, TRUE,
GETFILE_Drawer, nsoption_charp(download_dir),
GETFILE_DrawersOnly, TRUE,
GETFILE_ReadOnly, TRUE,
GETFILE_FullFileExpand, FALSE,
- GetFileEnd,
- CHILD_Label, LabelObj,
+ GetFileEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_DLDIR],
- LabelEnd,
- LayoutEnd, // downloads
+ LabelEnd),
+ LayoutEnd), // downloads
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutVObj,
+ 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] = CheckBoxObj,
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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,
- LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = (CheckBoxObj,
GA_ID, GID_OPTS_DOCKY,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_DOCKY],
@@ -1412,242 +1412,242 @@ void ami_gui_opts_open(void)
#ifndef __amigaos4__
GA_Disabled, TRUE,
#endif
- CheckBoxEnd,
- LayoutEnd, // behaviour
+ CheckBoxEnd),
+ LayoutEnd), // behaviour
CHILD_WeightedHeight, 0,
- LayoutEnd, // hgroup
+ LayoutEnd), // hgroup
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, LayoutHObj,
+ 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] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = (CheckBoxObj,
GA_ID, GID_OPTS_CLIPBOARD,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_CLIPBOARD],
GA_Selected, nsoption_bool(clipboard_write_utf8),
- CheckBoxEnd,
- LayoutEnd, // clipboard
+ CheckBoxEnd),
+ LayoutEnd), // clipboard
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SEARCH],
- LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = (ChooserObj,
GA_ID, GID_OPTS_SEARCH_PROV,
GA_RelVerify, TRUE,
CHOOSER_PopUp, TRUE,
CHOOSER_Labels, websearch_list,
CHOOSER_Selected, nsoption_int(search_provider),
CHOOSER_MaxLabels, 40,
- ChooserEnd,
- CHILD_Label, LabelObj,
+ ChooserEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV],
- LabelEnd,
- LayoutEnd, // search
+ LabelEnd),
+ LayoutEnd), // search
CHILD_WeightedHeight, 0,
- LayoutEnd, // hgroup
+ LayoutEnd), // hgroup
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MISC],
LAYOUT_SpaceOuter, TRUE,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = (CheckBoxObj,
GA_ID, GID_OPTS_FASTSCROLL,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_FASTSCROLL],
GA_Selected, nsoption_bool(faster_scroll),
- CheckBoxEnd,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = (CheckBoxObj,
GA_ID, GID_OPTS_SELECTMENU,
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_SELECTMENU],
GA_Selected, !nsoption_bool(core_select_menu),
GA_Disabled, !ami_selectmenu_is_safe(),
- CheckBoxEnd,
- LayoutEnd, // misc
+ CheckBoxEnd),
+ LayoutEnd), // misc
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
/*
** Export
*/
#ifdef WITH_PDF_EXPORT
- PAGE_Add, LayoutVObj,
- LAYOUT_AddChild, LayoutVObj,
- LAYOUT_AddChild, LayoutHObj,
+ PAGE_Add, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_MARGINS],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_TOP,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_top),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_TOP],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_LEFT,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_left),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_LEFT],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_BOTTOM,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_bottom),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_BOTTOM],
- LabelEnd,
- LAYOUT_AddChild, LayoutHObj,
+ LabelEnd),
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = (IntegerObj,
GA_ID, GID_OPTS_MARGIN_RIGHT,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(margin_right),
INTEGER_Minimum, 0,
INTEGER_Maximum, 99,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[LAB_OPTS_MM],
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_MARGIN_RIGHT],
- LabelEnd,
- LayoutEnd, // margins
+ LabelEnd),
+ LayoutEnd), // margins
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_SCALING],
- LAYOUT_AddChild, LayoutHObj,
+ LAYOUT_AddChild, (LayoutHObj,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObj,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = (IntegerObj,
GA_ID, GID_OPTS_EXPORT_SCALE,
GA_RelVerify, TRUE,
INTEGER_Number, nsoption_int(export_scale),
INTEGER_Minimum, 0,
INTEGER_Maximum, 100,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObj,
+ CHILD_Label, (LabelObj,
LABEL_Text, "%",
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObj,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObj,
LABEL_Text, gadlab[GID_OPTS_EXPORT_SCALE],
- LabelEnd,
- LayoutEnd, // scaling
+ LabelEnd),
+ LayoutEnd), // scaling
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_APPEARANCE],
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObj,
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ 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],
GA_Selected, nsoption_bool(enable_loosening),
- CheckBoxEnd,
- LayoutEnd, // appearance
+ CheckBoxEnd),
+ LayoutEnd), // appearance
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, LayoutVObj,
+ LAYOUT_AddChild, (LayoutVObj,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ADVANCED],
- LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObj,
+ 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] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = (CheckBoxObj,
GA_ID, GID_OPTS_EXPORT_PASSWORD,
GA_RelVerify, TRUE,
GA_Disabled, TRUE,
GA_Text, gadlab[GID_OPTS_EXPORT_PASSWORD],
GA_Selected, nsoption_bool(enable_PDF_password),
- CheckBoxEnd,
- LayoutEnd, // export
+ CheckBoxEnd),
+ LayoutEnd), // export
CHILD_WeightedHeight, 0,
- LayoutEnd, // page vgroup
+ LayoutEnd), // page vgroup
CHILD_WeightedHeight, 0,
- PageEnd, // page object
+ PageEnd), // page object
#endif
- End, // pagegroup
- ClickTabEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObj,
+ End), // pagegroup
+ ClickTabEnd),
+ 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] = ButtonObj,
+ ButtonEnd),
+ 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] = ButtonObj,
+ ButtonEnd),
+ LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = (ButtonObj,
GA_ID,GID_OPTS_CANCEL,
GA_Text,gadlab[GID_OPTS_CANCEL],
GA_RelVerify,TRUE,
- ButtonEnd,
- EndGroup, // save/use/cancel
- EndGroup, // main
- EndWindow;
+ ButtonEnd),
+ EndGroup), // save/use/cancel
+ EndGroup), // main
+ EndWindow);
gow->win = (struct Window *)RA_OpenWindow(gow->objects[OID_MAIN]);
ami_gui_win_list_add(gow, AMINS_GUIOPTSWINDOW, &ami_guiopts_table);
diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c
index fd33a67f3..72349ea35 100644
--- a/frontends/amiga/history.c
+++ b/frontends/amiga/history.c
@@ -371,7 +371,7 @@ ami_history_global_create_window(struct ami_history_global_window *history_win)
refresh_mode = WA_SimpleRefresh;
}
- ami_cw->objects[GID_CW_WIN] = WindowObj,
+ ami_cw->objects[GID_CW_WIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, ami_cw->wintitle,
WA_Activate, TRUE,
@@ -401,15 +401,15 @@ ami_history_global_create_window(struct ami_history_global_window *history_win)
WINDOW_MenuUserData, WGUD_HOOK,
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+ WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj,
GA_ID, GID_CW_DRAW,
SPACE_Transparent, TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
GA_RelVerify, TRUE,
- SpaceEnd,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndWindow);
if(ami_cw->objects[GID_CW_WIN] == NULL) {
return NSERROR_NOMEM;
diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c
index 5ad77ead7..24f7ba1f0 100644
--- a/frontends/amiga/history_local.c
+++ b/frontends/amiga/history_local.c
@@ -198,7 +198,7 @@ ami_history_local_create_window(struct ami_history_local_window *history_local_w
refresh_mode = WA_SimpleRefresh;
}
- ami_cw->objects[GID_CW_WIN] = WindowObj,
+ ami_cw->objects[GID_CW_WIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, ami_cw->wintitle,
WA_Activate, TRUE,
@@ -226,15 +226,15 @@ ami_history_local_create_window(struct ami_history_local_window *history_local_w
WINDOW_MenuUserData, WGUD_HOOK,
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+ WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj,
GA_ID, GID_CW_DRAW,
SPACE_Transparent, TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
GA_RelVerify, TRUE,
- SpaceEnd,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndWindow);
if(ami_cw->objects[GID_CW_WIN] == NULL) {
return NSERROR_NOMEM;
diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c
index 9a1d423bc..aaca4dc36 100644
--- a/frontends/amiga/hotlist.c
+++ b/frontends/amiga/hotlist.c
@@ -474,7 +474,7 @@ ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win)
refresh_mode = WA_SimpleRefresh;
}
- ami_cw->objects[GID_CW_WIN] = WindowObj,
+ ami_cw->objects[GID_CW_WIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, ami_cw->wintitle,
WA_Activate, TRUE,
@@ -504,15 +504,15 @@ ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win)
WINDOW_MenuUserData, WGUD_HOOK,
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+ WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj,
GA_ID, GID_CW_DRAW,
SPACE_Transparent, TRUE,
SPACE_BevelStyle, BVS_DISPLAY,
GA_RelVerify, TRUE,
- SpaceEnd,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndWindow);
if(ami_cw->objects[GID_CW_WIN] == NULL) {
return NSERROR_NOMEM;
diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c
index fe94eb25c..76181a71c 100644
--- a/frontends/amiga/libs.c
+++ b/frontends/amiga/libs.c
@@ -172,6 +172,8 @@
#ifdef __amigaos4__
AMINS_LIB_STRUCT(Application);
+#else
+struct Library *UtilityBase = NULL;
#endif
AMINS_LIB_STRUCT(Asl);
AMINS_LIB_STRUCT(DataTypes);
@@ -221,15 +223,15 @@ bool ami_libs_open(void)
#ifdef __amigaos4__
/* Libraries only needed on OS4 */
AMINS_LIB_OPEN("application.library", 53, Application, "application", 2, false)
+ AMINS_LIB_OPEN("dos.library", 37, DOS, "main", 1, true)
#else
/* Libraries we get automatically on OS4 but not OS3 */
- AMINS_LIB_OPEN("utility.library", 37, Utility, "main", 1, true)
+ AMINS_LIB_OPEN("utility.library", 47, Utility, "main", 1, true)
#endif
/* Standard libraries for both versions */
AMINS_LIB_OPEN("asl.library", 37, Asl, "main", 1, true)
AMINS_LIB_OPEN("datatypes.library", 39, DataTypes, "main", 1, true)
AMINS_LIB_OPEN("diskfont.library", 40, Diskfont, "main", 1, true)
- AMINS_LIB_OPEN("dos.library", 37, DOS, "main", 1, true)
AMINS_LIB_OPEN("gadtools.library", 37, GadTools, "main", 1, true)
AMINS_LIB_OPEN("graphics.library", 40, Graphics, "main", 1, true)
AMINS_LIB_OPEN("icon.library", 44, Icon, "main", 1, true)
@@ -330,7 +332,6 @@ void ami_libs_close(void)
AMINS_LIB_CLOSE(Asl)
AMINS_LIB_CLOSE(DataTypes)
AMINS_LIB_CLOSE(Diskfont)
- AMINS_LIB_CLOSE(DOS)
AMINS_LIB_CLOSE(GadTools)
AMINS_LIB_CLOSE(Graphics)
AMINS_LIB_CLOSE(Icon)
@@ -343,6 +344,7 @@ void ami_libs_close(void)
AMINS_LIB_CLOSE(Workbench)
#ifdef __amigaos4__
AMINS_LIB_CLOSE(Application)
+ AMINS_LIB_CLOSE(DOS)
#else
AMINS_LIB_CLOSE(Utility)
#endif
diff --git a/frontends/amiga/libs.h b/frontends/amiga/libs.h
index db5b65c75..dd8295001 100644
--- a/frontends/amiga/libs.h
+++ b/frontends/amiga/libs.h
@@ -76,6 +76,8 @@ extern Class *WindowClass;
#define StringObj NewObject(StringClass, NULL
#define WindowObj NewObject(WindowClass, NULL
+#define EndObj TAG_DONE)
+
/* Functions */
bool ami_libs_open(void);
void ami_libs_close(void);
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 23e922a41..8060a5d49 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -53,89 +53,6 @@ struct FormatContext
BOOL Overflow;
};
-STATIC VOID ASM
-StuffChar(
- REG(a3, struct FormatContext * Context),
- REG(d0, UBYTE Char))
-{
- /* Is there still room? */
- if(Context->Size > 0)
- {
- (*Context->Index) = Char;
-
- Context->Index++;
- Context->Size--;
-
- /* Is there only a single character left? */
- if(Context->Size == 1)
- {
- /* Provide null-termination. */
- (*Context->Index) = '\0';
-
- /* Don't store any further characters. */
- Context->Size = 0;
- }
- }
- else
- {
- Context->Overflow = TRUE;
- }
-}
-
-BOOL
-VSPrintfN(
- LONG MaxLen,
- STRPTR Buffer,
- const STRPTR FormatString,
- const va_list VarArgs)
-{
- BOOL result = FAILURE;
-
- /* format a text, but place only up to MaxLen
- * characters in the output buffer (including
- * the terminating NUL)
- */
-
- if (Buffer == NULL || FormatString == NULL) return(result);
-
- if(MaxLen > 1)
- {
- struct FormatContext Context;
-
- Context.Index = Buffer;
- Context.Size = MaxLen;
- Context.Overflow = FALSE;
-
- RawDoFmt(FormatString,(APTR)VarArgs,(VOID (*)())StuffChar,(APTR)&Context);
-
- if(NO Context.Overflow)
- result = SUCCESS;
- }
-
- return(result);
-}
-
-BOOL
-SPrintfN(
- LONG MaxLen,
- STRPTR Buffer,
- const STRPTR FormatString,
- ...)
-{
- va_list VarArgs;
- BOOL result = FAILURE;
-
- /* format a text, varargs version */
-
- if (Buffer == NULL && FormatString == NULL) return result;
-
- va_start(VarArgs,FormatString);
- result = VSPrintfN(MaxLen,Buffer,FormatString,VarArgs);
- va_end(VarArgs);
-
- return(result);
-}
-
char *ASPrintf(const char *fmt, ...)
{
int r;
@@ -144,7 +61,7 @@ char *ASPrintf(const char *fmt, ...)
char *rbuf;
va_start(ap, fmt);
- r = VSPrintfN(2048, buffer, (const STRPTR)fmt, ap);
+ r = VSNPrintf(buffer, 2048, (const STRPTR)fmt, ap);
va_end(ap);
r = strlen(buffer);
@@ -299,5 +216,7 @@ ULONG RefreshSetGadgetAttrs(struct Gadget *g, struct Window *w, struct Requester
return RefreshSetGadgetAttrsA(g,w,r,(struct TagItem *) &tag1);
}
+
+
#endif
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index 2df014117..22c74da2f 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -65,27 +65,17 @@
/* Ignore unsupported tags */
#define ASO_NoTrack TAG_IGNORE
-#define BITMAP_DisabledSourceFile TAG_IGNORE
-#define BITMAP_HasAlpha TAG_IGNORE
#define BLITA_UseSrcAlpha TAG_IGNORE
#define BLITA_MaskPlane TAG_IGNORE
-#define CLICKTAB_FlagImage TAG_IGNORE
-#define CLICKTAB_LabelTruncate TAG_IGNORE
#define PDTA_PromoteMask TAG_IGNORE
#define RPTAG_APenColor TAG_IGNORE
#define GA_ContextMenu TAG_IGNORE
#define GA_HintInfo TAG_IGNORE
#define GAUGEIA_Level TAG_IGNORE
#define IA_InBorder TAG_IGNORE
-#define LBNCA_SoftStyle TAG_IGNORE
-#define LISTBROWSER_Striping TAG_IGNORE
#define SA_Compositing TAG_IGNORE
-#define SBNA_HintInfo TAG_IGNORE
-#define TNA_HintInfo TAG_IGNORE
#define WA_ContextMenuHook TAG_IGNORE
#define WA_ToolBox TAG_IGNORE
-#define WINDOW_BuiltInScroll TAG_IGNORE
-#define WINDOW_NewPrefsHook TAG_IGNORE
/* raw keycodes */
#define RAWKEY_BACKSPACE 0x41
@@ -115,16 +105,10 @@
#define DN_FULLPATH 0
#define BGBACKFILL JAM1
#define ML_SEPARATOR NM_BARLABEL
-#define LBS_ROWS 0
/* Renamed structures */
#define AnchorPathOld AnchorPath
-/* ReAction (ClassAct) macros */
-#define GetFileEnd End
-#define GetFontEnd End
-#define GetScreenModeEnd End
-
/* MinTerm stuff */
#define MINTERM_SRCMASK (ABC|ABNC|ANBC)
diff --git a/frontends/amiga/pageinfo.c b/frontends/amiga/pageinfo.c
index 54de0d008..6e83958af 100644
--- a/frontends/amiga/pageinfo.c
+++ b/frontends/amiga/pageinfo.c
@@ -181,7 +181,7 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win, ULONG left,
refresh_mode = WA_SimpleRefresh;
}
- ami_cw->objects[GID_CW_WIN] = WindowObj,
+ ami_cw->objects[GID_CW_WIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Activate, TRUE,
WA_DepthGadget, FALSE,
@@ -203,15 +203,15 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win, ULONG left,
WINDOW_SharedPort, ami_gui_get_shared_msgport(),
WINDOW_UserData, pageinfo_win,
WINDOW_IconifyGadget, FALSE,
- WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+ WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj,
GA_ID, GID_CW_DRAW,
SPACE_Transparent, TRUE,
SPACE_BevelStyle, BVS_BOX,
GA_RelVerify, TRUE,
- SpaceEnd,
- EndGroup,
- EndWindow;
+ SpaceEnd),
+ EndGroup),
+ EndWindow);
if(ami_cw->objects[GID_CW_WIN] == NULL) {
return NSERROR_NOMEM;
diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c
index 97c70b96c..5040c8aeb 100644
--- a/frontends/amiga/print.c
+++ b/frontends/amiga/print.c
@@ -268,7 +268,7 @@ void ami_print_ui(struct hlcache_handle *c)
ami_print_ui_setup();
- pw->objects[POID_MAIN] = WindowObj,
+ pw->objects[POID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, gadlab[PGID_PRINT],
WA_Activate, TRUE,
@@ -281,18 +281,18 @@ void ami_print_ui(struct hlcache_handle *c)
WINDOW_UserData, pw,
WINDOW_IconifyGadget, FALSE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ChooserObject,
+ WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, (ChooserObject,
GA_ID, PGID_PRINTER,
GA_RelVerify, TRUE,
GA_TabCycle, TRUE,
CHOOSER_LabelArray, printers,
CHOOSER_Selected, nsoption_int(printer_unit),
- ChooserEnd,
- CHILD_Label, LabelObject,
+ ChooserEnd),
+ CHILD_Label, (LabelObject,
LABEL_Text, gadlab[PGID_PRINTER],
- LabelEnd,
- LAYOUT_AddChild, IntegerObject,
+ LabelEnd),
+ LAYOUT_AddChild, (IntegerObject,
GA_ID, PGID_COPIES,
GA_RelVerify, TRUE,
GA_TabCycle, TRUE,
@@ -300,13 +300,13 @@ void ami_print_ui(struct hlcache_handle *c)
INTEGER_Minimum, 1,
INTEGER_Maximum, 100,
INTEGER_Arrows, TRUE,
- IntegerEnd,
- CHILD_Label, LabelObject,
+ IntegerEnd),
+ CHILD_Label, (LabelObject,
LABEL_Text, gadlab[PGID_COPIES],
- LabelEnd,
- LAYOUT_AddChild, HGroupObject,
+ LabelEnd),
+ LAYOUT_AddChild, (HGroupObject,
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = IntegerObj,
+ LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = (IntegerObj,
GA_ID, PGID_SCALE,
GA_RelVerify, TRUE,
GA_TabCycle, TRUE,
@@ -314,33 +314,33 @@ void ami_print_ui(struct hlcache_handle *c)
INTEGER_Minimum, 0,
INTEGER_Maximum, 100,
INTEGER_Arrows, TRUE,
- IntegerEnd,
+ IntegerEnd),
CHILD_WeightedWidth, 0,
- CHILD_Label, LabelObject,
+ CHILD_Label, (LabelObject,
LABEL_Text, "%",
- LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObject,
+ LabelEnd),
+ LayoutEnd),
+ CHILD_Label, (LabelObject,
LABEL_Text, gadlab[PGID_SCALE],
- LabelEnd,
- LAYOUT_AddChild, HGroupObject,
- LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = ButtonObj,
+ LabelEnd),
+ LAYOUT_AddChild, (HGroupObject,
+ LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = (ButtonObj,
GA_ID, PGID_PRINT,
GA_RelVerify,TRUE,
GA_Text, gadlab[PGID_PRINT],
GA_TabCycle,TRUE,
- ButtonEnd,
+ ButtonEnd),
CHILD_WeightedHeight,0,
- LAYOUT_AddChild, pw->gadgets[PGID_CANCEL] = ButtonObj,
+ LAYOUT_AddChild, pw->gadgets[PGID_CANCEL] = (ButtonObj,
GA_ID, PGID_CANCEL,
GA_RelVerify, TRUE,
GA_Text, gadlab[PGID_CANCEL],
GA_TabCycle,TRUE,
- ButtonEnd,
- LayoutEnd,
+ ButtonEnd),
+ LayoutEnd),
CHILD_WeightedHeight,0,
- EndGroup,
- EndWindow;
+ EndGroup),
+ EndWindow);
pw->win = (struct Window *)RA_OpenWindow(pw->objects[POID_MAIN]);
ami_gui_win_list_add(pw, AMINS_PRINTWINDOW, &ami_print_table);
@@ -557,7 +557,7 @@ bool ami_print_dump(void)
void ami_print_progress(void)
{
- ami_print_info.objects[POID_MAIN] = WindowObj,
+ ami_print_info.objects[POID_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, messages_get("Printing"),
WA_Activate, TRUE,
@@ -571,8 +571,8 @@ void ami_print_progress(void)
WINDOW_IconifyGadget, FALSE,
WINDOW_LockHeight,TRUE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, ami_print_info.gadgets[PGID_MAIN] = LayoutVObj,
- LAYOUT_AddChild, ami_print_info.gadgets[PGID_STATUS] = FuelGaugeObj,
+ WINDOW_ParentGroup, ami_print_info.gadgets[PGID_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, ami_print_info.gadgets[PGID_STATUS] = (FuelGaugeObj,
GA_ID,PGID_STATUS,
FUELGAUGE_Min,0,
FUELGAUGE_Max,ami_print_info.pages,
@@ -581,7 +581,7 @@ void ami_print_progress(void)
FUELGAUGE_ShortTicks,TRUE,
FUELGAUGE_Percent,TRUE,
FUELGAUGE_Justification,FGJ_CENTER,
- FuelGaugeEnd,
+ FuelGaugeEnd),
CHILD_NominalSize,TRUE,
CHILD_WeightedHeight,0,
/*
@@ -593,8 +593,8 @@ void ami_print_progress(void)
GA_TabCycle,TRUE,
ButtonEnd,
*/
- EndGroup,
- EndWindow;
+ EndGroup),
+ EndWindow);
ami_print_info.win = (struct Window *)RA_OpenWindow(ami_print_info.objects[POID_MAIN]);
}
diff --git a/frontends/amiga/rtg.c b/frontends/amiga/rtg.c
index 8618c0a33..9963ed038 100644
--- a/frontends/amiga/rtg.c
+++ b/frontends/amiga/rtg.c
@@ -20,6 +20,8 @@
* Abstract RTG functions for newer/older/non-P96 systems
*/
+#include <proto/graphics.h>
+
#include "amiga/rtg.h"
struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth,
diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c
index 853c06fef..26a04ad22 100755
--- a/frontends/amiga/search.c
+++ b/frontends/amiga/search.c
@@ -161,7 +161,7 @@ void ami_search_open(struct gui_window *gwin)
fwin->message[SSTR_PREV] = ami_utf8_easy(messages_get("Prev"));
fwin->message[SSTR_NEXT] = ami_utf8_easy(messages_get("Next"));
- fwin->objects[OID_S_MAIN] = WindowObj,
+ fwin->objects[OID_S_MAIN] = (WindowObj,
WA_ScreenTitle, ami_gui_get_screen_title(),
WA_Title, fwin->message[SSTR_TITLE],
WA_Activate, TRUE,
@@ -175,47 +175,47 @@ void ami_search_open(struct gui_window *gwin)
WINDOW_IconifyGadget, FALSE,
WINDOW_LockHeight, TRUE,
WINDOW_Position, WPOS_CENTERSCREEN,
- WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = LayoutVObj,
- LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = StringObj,
+ WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = (LayoutVObj,
+ LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = (StringObj,
GA_ID, GID_S_SEARCHSTRING,
GA_TabCycle, TRUE,
GA_RelVerify, TRUE,
- StringEnd,
+ StringEnd),
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, fwin->objects[GID_S_CASE] = CheckBoxObj,
+ LAYOUT_AddChild, fwin->objects[GID_S_CASE] = (CheckBoxObj,
GA_ID, GID_S_CASE,
GA_Text, fwin->message[SSTR_CASE],
GA_Selected, FALSE,
GA_TabCycle, TRUE,
GA_RelVerify, TRUE,
- CheckBoxEnd,
- LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = CheckBoxObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = (CheckBoxObj,
GA_ID,GID_S_SHOWALL,
GA_Text, fwin->message[SSTR_SHOWALL],
GA_Selected, FALSE,
GA_TabCycle, TRUE,
GA_RelVerify, TRUE,
- CheckBoxEnd,
- LAYOUT_AddChild, LayoutHObj,
- LAYOUT_AddChild, fwin->objects[GID_S_PREV] = ButtonObj,
+ CheckBoxEnd),
+ LAYOUT_AddChild, (LayoutHObj,
+ LAYOUT_AddChild, fwin->objects[GID_S_PREV] = (ButtonObj,
GA_ID, GID_S_PREV,
GA_RelVerify, TRUE,
GA_Text, fwin->message[SSTR_PREV],
GA_TabCycle, TRUE,
GA_Disabled, TRUE,
- ButtonEnd,
+ ButtonEnd),
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = ButtonObj,
+ LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = (ButtonObj,
GA_ID, GID_S_NEXT,
GA_RelVerify, TRUE,
GA_Text, fwin->message[SSTR_NEXT],
GA_TabCycle, TRUE,
GA_Disabled, TRUE,
- ButtonEnd,
- LayoutEnd,
+ ButtonEnd),
+ LayoutEnd),
CHILD_WeightedHeight,0,
- EndGroup,
- EndWindow;
+ EndGroup),
+ EndWindow);
fwin->win = (struct Window *)RA_OpenWindow(fwin->objects[OID_S_MAIN]);
fwin->gwin = gwin;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 02:27:09 +0000