summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2022-03-15 14:14:05 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2022-03-15 14:14:05 +0000
commit7b638b07136190f2feed583e313a74b9f21ea2bf (patch)
tree1f6dfe57bf45e60179867c1bfe1934a3a64736bb
parente24a285d34d37151be3f6c0d7d126f5fa9531e2e (diff)
downloadnetsurf-7b638b07136190f2feed583e313a74b9f21ea2bf.tar.gz
netsurf-7b638b07136190f2feed583e313a74b9f21ea2bf.tar.bz2
Amiga: add more brackets to placate NewObject()
-rw-r--r--frontends/amiga/pageinfo.c12
-rw-r--r--frontends/amiga/print.c64
-rwxr-xr-xfrontends/amiga/search.c32
3 files changed, 54 insertions, 54 deletions
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/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;