external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Fix build under LLVM15

Browse source 
Fix many -Wint-conversion errors such as the example below, including
an aso atomics error.

connect.c:87:12: error: incompatible pointer to integer conversion initializing 'LONG' (aka 'int') with an expression of type 'void *' [-Wint-conversion]
   DB_ADDR mdba = NULL;   /* db address of current member record */
           ^      ~~~~
This commit is contained in:
Cy Schubert 2023-02-15 10:12:21 -08:00 • committed by Jon Trulson
parent 65e8cf9019
commit 8a24d70d5e
22 changed files with 183 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/lib/DtHelp/AccessCCDF.c
View file

@ -59,6 +59,8 @@
extern int errno;
#endif
extern char *_DtHelpGetLocale(void);
/*
* Canvas Engine includes
*/

4
cde/lib/DtSearch/raima/connect.c
View file

@ -84,8 +84,8 @@ int dbn /* Database number */
char *orec; /* ptr to current owner record contents in cache */
char *mrec; /* ptr to current member record contents in cache */
char *nrec; /* ptr to next member record contents in cache */
DB_ADDR mdba = NULL; /* db address of current member record */
DB_ADDR ndba = NULL; /* db address of next member record */
DB_ADDR mdba = 0; /* db address of current member record */
DB_ADDR ndba = 0; /* db address of next member record */
INT ordering; /* set order control variable */
int stat, compare; /* status code & sort comparison result */
SET_ENTRY *set_ptr;

30
cde/programs/dtappbuilder/src/ab/pal_button.c
View file

@ -294,11 +294,11 @@ button_prop_init(
/* Button Type */
n = 0;
item[n] = cgen->buttontype_rbox_items.Push_item;
item_ptr[n] = AB_BUT_PUSH; n++;
item_ptr[n] = (void *) AB_BUT_PUSH; n++;
item[n] = cgen->buttontype_rbox_items.Drawn_item;
item_ptr[n] = AB_BUT_DRAWN; n++;
item_ptr[n] = (void *) AB_BUT_DRAWN; n++;
item[n] = cgen->buttontype_rbox_items.Menu_item;
item_ptr[n] = AB_BUT_MENU; n++;
item_ptr[n] = (void *) AB_BUT_MENU; n++;
prop_radiobox_init(&(pbs->button_type), cgen->buttontype_rbox_label,
cgen->buttontype_rbox, n, item, item_ptr,
cgen->buttontype_cb);
@ -309,11 +309,11 @@ button_prop_init(
/* Label Type */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
item[n] = cgen->labeltype_rbox_items.Arrow_item;
item_ptr[n] = AB_LABEL_ARROW_DOWN; n++;
item_ptr[n] = (void *) AB_LABEL_ARROW_DOWN; n++;
prop_options_init(&(pbs->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -346,11 +346,11 @@ button_prop_init(
/* Label Align */
n = 0;
item[n] = cgen->labelalign_opmenu_items.Left_item;
item_ptr[n] = AB_ALIGN_LEFT; n++;
item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
item[n] = cgen->labelalign_opmenu_items.Centered_item;
item_ptr[n] = AB_ALIGN_CENTER; n++;
item_ptr[n] = (void *) AB_ALIGN_CENTER; n++;
item[n] = cgen->labelalign_opmenu_items.Right_item;
item_ptr[n] = AB_ALIGN_RIGHT; n++;
item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
prop_options_init(&(pbs->label_align), cgen->labelalign_opmenu_label,
cgen->labelalign_opmenu, cgen->labelalign_opmenu_menu,
n, item, item_ptr,
@ -359,13 +359,13 @@ button_prop_init(
/* Arrow Direction */
n = 0;
item[n] = cgen->arrowdir_opmenu_items.Up_item;
item_ptr[n] = AB_LABEL_ARROW_UP; n++;
item_ptr[n] = (void *) AB_LABEL_ARROW_UP; n++;
item[n] = cgen->arrowdir_opmenu_items.Down_item;
item_ptr[n] = AB_LABEL_ARROW_DOWN; n++;
item_ptr[n] = (void *) AB_LABEL_ARROW_DOWN; n++;
item[n] = cgen->arrowdir_opmenu_items.Right_item;
item_ptr[n] = AB_LABEL_ARROW_RIGHT; n++;
item_ptr[n] = (void *) AB_LABEL_ARROW_RIGHT; n++;
item[n] = cgen->arrowdir_opmenu_items.Left_item;
item_ptr[n] = AB_LABEL_ARROW_LEFT; n++;
item_ptr[n] = (void *) AB_LABEL_ARROW_LEFT; n++;
prop_options_init(&(pbs->arrow_dir), cgen->arrowdir_opmenu_label,
cgen->arrowdir_opmenu, cgen->arrowdir_opmenu_menu,
n, item, item_ptr,
@ -380,9 +380,9 @@ button_prop_init(
/* Size Policy */
n = 0;
item[n] = cgen->sizepolicy_rbox_items.Size_of_Label_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->sizepolicy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pbs->size_policy), cgen->sizepolicy_rbox_label,
cgen->sizepolicy_rbox, n, item, item_ptr,
cgen->sizepolicy_cb);

22
cde/programs/dtappbuilder/src/ab/pal_choice.c
View file

@ -343,9 +343,9 @@ choice_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pcs->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr, cgen->labeltype_cb);
@ -357,9 +357,9 @@ choice_prop_init(
n = 0;
item[n] = cgen->labelpos_rbox_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
item[n] = cgen->labelpos_rbox_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
prop_options_init(&(pcs->label_pos), cgen->labelpos_rbox_label,
cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
n, item, item_ptr, cgen->labeltype_cb);
@ -368,11 +368,11 @@ choice_prop_init(
/* Choice Type */
n = 0;
item[n] = cgen->choicetype_rbox_items.Radio_Box_item;
item_ptr[n] = AB_CHOICE_EXCLUSIVE; n++;
item_ptr[n] = (void *) AB_CHOICE_EXCLUSIVE; n++;
item[n] = cgen->choicetype_rbox_items.Check_Box_item;
item_ptr[n] = AB_CHOICE_NONEXCLUSIVE; n++;
item_ptr[n] = (void *) AB_CHOICE_NONEXCLUSIVE; n++;
item[n] = cgen->choicetype_rbox_items.Option_Menu_item;
item_ptr[n] = AB_CHOICE_OPTION_MENU; n++;
item_ptr[n] = (void *) AB_CHOICE_OPTION_MENU; n++;
prop_options_init(&(pcs->choice_type), cgen->choicetype_rbox_label,
cgen->choicetype_rbox, cgen->choicetype_rbox_menu,
n, item, item_ptr,
@ -384,9 +384,9 @@ choice_prop_init(
/* Rows/Columns */
n = 0;
item[n] = cgen->layout_rbox_items.Columns_item;
item_ptr[n] = AB_ORIENT_VERTICAL; n++;
item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
item[n] = cgen->layout_rbox_items.Rows_item;
item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
prop_radiobox_init(&(pcs->row_col), cgen->layout_rbox_label,
cgen->layout_rbox,
n, item, item_ptr,
@ -428,9 +428,9 @@ choice_prop_init(
/* Item Label Type */
n = 0;
item[n] = cgen->itemlabel_opmenu_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->itemlabel_opmenu_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pcs->item_label_type), cgen->itemlabel_type_label,
cgen->itemlabel_opmenu, cgen->itemlabel_opmenu_menu,
n, item, item_ptr, cgen->itemlist_cb);

16
cde/programs/dtappbuilder/src/ab/pal_combobox.c
View file

@ -295,9 +295,9 @@ combo_box_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pcs->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -310,9 +310,9 @@ combo_box_prop_init(
n = 0;
item[n] = cgen->labelpos_rbox_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
item[n] = cgen->labelpos_rbox_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
prop_options_init(&(pcs->label_pos), cgen->labelpos_rbox_label,
cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
n, item, item_ptr,
@ -321,9 +321,9 @@ combo_box_prop_init(
/* Read Only */
n = 0;
item[n] = cgen->comboboxtype_rbox_items.Static_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
item[n] = cgen->comboboxtype_rbox_items.Editable_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
prop_radiobox_init(&(pcs->combobox_type), cgen->comboboxtype_rbox_label,
cgen->comboboxtype_rbox, n, item, item_ptr,
cgen->comboboxtype_cb);
@ -339,9 +339,9 @@ combo_box_prop_init(
/* Width */
n = 0;
item[n] = cgen->wpolicy_rbox_items.Longest_Item_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->wpolicy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pcs->wth_policy), cgen->wpolicy_rbox_label,
cgen->wpolicy_rbox, n, item, item_ptr,
cgen->wpolicy_cb);

14
cde/programs/dtappbuilder/src/ab/pal_cpanel.c
View file

@ -281,15 +281,15 @@ cpanel_prop_init(
/* Border Frame Setting */
n = 0;
item[n] = cgen->bframe_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
item_ptr[n] = AB_LINE_SHADOW_IN; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
prop_options_init(&(pcs->frame), cgen->bframe_opmenu_label,
cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
n, item, item_ptr,
@ -309,9 +309,9 @@ cpanel_prop_init(
/* Size Policy */
n = 0;
item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->size_policy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pcs->size_policy), cgen->size_policy_rbox_label,
cgen->size_policy_rbox, n, item, item_ptr,
cgen->size_policy_cb);

14
cde/programs/dtappbuilder/src/ab/pal_custdlg.c
View file

@ -303,7 +303,7 @@ custdlg_prop_init(
/* Window Parent */
n = 0;
item[n] = cgen->winparent_opmenu_items.None_item;
item_ptr[n] = 0; n++;
item_ptr[n] = (void *) 0; n++;
prop_obj_options_init(&(pcs->win_parent), cgen->winparent_opmenu_label,
cgen->winparent_opmenu, cgen->winparent_opmenu_menu,
n, item, item_ptr,
@ -317,9 +317,9 @@ custdlg_prop_init(
/* Resize Mode */
n = 0;
item[n] = cgen->resizemode_rbox_items.Adjustable_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
item[n] = cgen->resizemode_rbox_items.Fixed_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
prop_radiobox_init(&(pcs->resize_mode), cgen->resizemode_rbox_label,
cgen->resizemode_rbox, n, item, item_ptr,
cgen->resizemode_cb);
@ -338,7 +338,7 @@ custdlg_prop_init(
/* Default Button */
n = 0;
item[n] = cgen->defaultb_opmenu_items.None_item;
item_ptr[n] = 0; n++;
item_ptr[n] = (void *) 0; n++;
prop_obj_options_init(&(pcs->default_but), cgen->defaultb_opmenu_label,
cgen->defaultb_opmenu, cgen->defaultb_opmenu_menu,
n, item, item_ptr,
@ -348,7 +348,7 @@ custdlg_prop_init(
/* Help Button */
n = 0;
item[n] = cgen->helpb_opmenu_items.None_item;
item_ptr[n] = 0; n++;
item_ptr[n] = (void *) 0; n++;
prop_obj_options_init(&(pcs->help_but), cgen->helpb_opmenu_label,
cgen->helpb_opmenu, cgen->helpb_opmenu_menu,
n, item, item_ptr,
@ -358,9 +358,9 @@ custdlg_prop_init(
/* Size Policy */
n = 0;
item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->size_policy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pcs->size_policy), cgen->size_policy_rbox_label,
cgen->size_policy_rbox, n, item, item_ptr,
cgen->size_policy_cb);

16
cde/programs/dtappbuilder/src/ab/pal_drawp.c
View file

@ -273,11 +273,11 @@ drawp_prop_init(
/* Scrolling */
n = 0;
item[n] = cgen->scrolldisp_rbox_items.Never_item;
item_ptr[n] = AB_SCROLLBAR_NEVER; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_NEVER; n++;
item[n] = cgen->scrolldisp_rbox_items.Always_item;
item_ptr[n] = AB_SCROLLBAR_ALWAYS; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_ALWAYS; n++;
item[n] = cgen->scrolldisp_rbox_items.When_Needed_item;
item_ptr[n] = AB_SCROLLBAR_WHEN_NEEDED; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_WHEN_NEEDED; n++;
prop_radiobox_init(&(pds->scrolling), cgen->scrolldisp_rbox_label,
cgen->scrolldisp_rbox, n, item, item_ptr,
cgen->scroll_cb);
@ -289,15 +289,15 @@ drawp_prop_init(
/* Border Frame */
n = 0;
item[n] = cgen->bframe_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
item_ptr[n] = AB_LINE_SHADOW_IN; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
prop_options_init(&(pds->frame), cgen->bframe_opmenu_label,
cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
n, item, item_ptr,

6
cde/programs/dtappbuilder/src/ab/pal_fchooser.c
View file

@ -282,11 +282,11 @@ fchooser_prop_init(
/* Search Pattern Type */
n = 0;
item[n] = cgen->pattern_type_rbox_items.Files_item;
item_ptr[n] = AB_FILE_REGULAR; n++;
item_ptr[n] = (void *) AB_FILE_REGULAR; n++;
item[n] = cgen->pattern_type_rbox_items.Directories_item;
item_ptr[n] = AB_FILE_DIRECTORY; n++;
item_ptr[n] = (void *) AB_FILE_DIRECTORY; n++;
item[n] = cgen->pattern_type_rbox_items.Both_item;
item_ptr[n] = AB_FILE_ANY; n++;
item_ptr[n] = (void *) AB_FILE_ANY; n++;
prop_radiobox_init(&(pcs->pattern_type), cgen->pattern_type_rbox_label,
cgen->pattern_type_rbox, n, item, item_ptr,
cgen->pattern_type_cb);

36
cde/programs/dtappbuilder/src/ab/pal_group.c
View file

@ -742,15 +742,15 @@ group_prop_init(
/* Border Frame Setting */
n = 0;
item[n] = cgen->bframe_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
item_ptr[n] = AB_LINE_SHADOW_IN; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
prop_options_init(&(pgs->frame), cgen->bframe_opmenu_label,
cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
n, item, item_ptr,
@ -759,13 +759,13 @@ group_prop_init(
/* Layout Type */
n = 0;
item[n] = cgen->layout_rbox_items.bitmaps_ggp_as_is_xbm_item;
item_ptr[n] = AB_GROUP_IGNORE; n++;
item_ptr[n] = (void *) AB_GROUP_IGNORE; n++;
item[n] = cgen->layout_rbox_items.bitmaps_ggp_col_xbm_item;
item_ptr[n] = AB_GROUP_COLUMNS; n++;
item_ptr[n] = (void *) AB_GROUP_COLUMNS; n++;
item[n] = cgen->layout_rbox_items.bitmaps_ggp_row_xbm_item;
item_ptr[n] = AB_GROUP_ROWS; n++;
item_ptr[n] = (void *) AB_GROUP_ROWS; n++;
item[n] = cgen->layout_rbox_items.bitmaps_ggp_rowcol_xbm_item;
item_ptr[n] = AB_GROUP_ROWSCOLUMNS; n++;
item_ptr[n] = (void *) AB_GROUP_ROWSCOLUMNS; n++;
prop_radiobox_init(&(pgs->layout_type), cgen->layout_rbox_label,
cgen->layout_rbox, n, item, item_ptr,
cgen->layout_cb1);
@ -781,9 +781,9 @@ group_prop_init(
/* Grid Row/Columns */
n = 0;
item[n] = cgen->gridrowcol_rbox_items.Rows_item;
item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
item[n] = cgen->gridrowcol_rbox_items.Columns_item;
item_ptr[n] = AB_ORIENT_VERTICAL; n++;
item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
prop_radiobox_init(&(pgs->grid_rowcol), NULL,
cgen->gridrowcol_rbox, n, item, item_ptr,
cgen->gridrowcol_cb);
@ -795,13 +795,13 @@ group_prop_init(
/* Vertical Alignment */
n = 0;
item[n] = cgen->valign_opmenu_items.bitmaps_align_left_xbm_item;
item_ptr[n] = AB_ALIGN_LEFT; n++;
item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
item[n] = cgen->valign_opmenu_items.bitmaps_align_labels_xbm_item;
item_ptr[n] = AB_ALIGN_LABELS; n++;
item_ptr[n] = (void *) AB_ALIGN_LABELS; n++;
item[n] = cgen->valign_opmenu_items.bitmaps_align_vcenter_xbm_item;
item_ptr[n] = AB_ALIGN_VCENTER; n++;
item_ptr[n] = (void *) AB_ALIGN_VCENTER; n++;
item[n] = cgen->valign_opmenu_items.bitmaps_align_right_xbm_item;
item_ptr[n] = AB_ALIGN_RIGHT; n++;
item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
prop_options_init(&(pgs->valign), cgen->valign_opmenu_label,
cgen->valign_opmenu, cgen->valign_opmenu_menu,
n, item, item_ptr,
@ -814,11 +814,11 @@ group_prop_init(
/* Horizontal Alignment */
n = 0;
item[n] = cgen->halign_opmenu_items.bitmaps_align_top_xbm_item;
item_ptr[n] = AB_ALIGN_TOP; n++;
item_ptr[n] = (void *) AB_ALIGN_TOP; n++;
item[n] = cgen->halign_opmenu_items.bitmaps_align_hcenter_xbm_item;
item_ptr[n] = AB_ALIGN_HCENTER; n++;
item_ptr[n] = (void *) AB_ALIGN_HCENTER; n++;
item[n] = cgen->halign_opmenu_items.bitmaps_align_bottom_xbm_item;
item_ptr[n] = AB_ALIGN_BOTTOM; n++;
item_ptr[n] = (void *) AB_ALIGN_BOTTOM; n++;
prop_options_init(&(pgs->halign), cgen->halign_opmenu_label,
cgen->halign_opmenu, cgen->halign_opmenu_menu,
n, item, item_ptr,

14
cde/programs/dtappbuilder/src/ab/pal_label.c
View file

@ -257,9 +257,9 @@ label_prop_init(
/* Label Type */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pls->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -274,11 +274,11 @@ label_prop_init(
/* Label Align */
n = 0;
item[n] = cgen->labelalign_opmenu_items.Left_item;
item_ptr[n] = AB_ALIGN_LEFT; n++;
item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
item[n] = cgen->labelalign_opmenu_items.Centered_item;
item_ptr[n] = AB_ALIGN_CENTER; n++;
item_ptr[n] = (void *) AB_ALIGN_CENTER; n++;
item[n] = cgen->labelalign_opmenu_items.Right_item;
item_ptr[n] = AB_ALIGN_RIGHT; n++;
item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
prop_options_init(&(pls->label_align), cgen->labelalign_opmenu_label,
cgen->labelalign_opmenu, cgen->labelalign_opmenu_menu,
n, item, item_ptr,
@ -287,9 +287,9 @@ label_prop_init(
/* Size Policy */
n = 0;
item[n] = cgen->szpolicy_rbox_items.Size_of_Label_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->szpolicy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pls->size_policy), cgen->szpolicy_rbox_label,
cgen->szpolicy_rbox, n, item, item_ptr,
cgen->szpolicy_cb);

24
cde/programs/dtappbuilder/src/ab/pal_list.c
View file

@ -307,9 +307,9 @@ list_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pls->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -322,9 +322,9 @@ list_prop_init(
n = 0;
item[n] = cgen->labelpos_rbox_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
item[n] = cgen->labelpos_rbox_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
prop_options_init(&(pls->label_pos), cgen->labelpos_rbox_label,
cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
n, item, item_ptr,
@ -333,13 +333,13 @@ list_prop_init(
/* Selection Mode */
n = 0;
item[n] = cgen->selmode_rbox_items.Single_Select_item;
item_ptr[n] = AB_SELECT_SINGLE; n++;
item_ptr[n] = (void *) AB_SELECT_SINGLE; n++;
item[n] = cgen->selmode_rbox_items.Browse_Select_item;
item_ptr[n] = AB_SELECT_BROWSE; n++;
item_ptr[n] = (void *) AB_SELECT_BROWSE; n++;
item[n] = cgen->selmode_rbox_items.Multiple_Select_item;
item_ptr[n] = AB_SELECT_MULTIPLE; n++;
item_ptr[n] = (void *) AB_SELECT_MULTIPLE; n++;
item[n] = cgen->selmode_rbox_items.Browse_Multiple_Select_item;
item_ptr[n] = AB_SELECT_BROWSE_MULTIPLE; n++;
item_ptr[n] = (void *) AB_SELECT_BROWSE_MULTIPLE; n++;
prop_options_init(&(pls->sel_mode), cgen->selmode_rbox_label,
cgen->selmode_rbox, cgen->selmode_rbox_menu,
n, item, item_ptr,
@ -355,9 +355,9 @@ list_prop_init(
/* Width */
n = 0;
item[n] = cgen->wpolicy_rbox_items.Longest_Item_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->wpolicy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pls->wth_policy), cgen->wpolicy_rbox_label,
cgen->wpolicy_rbox, n, item, item_ptr,
cgen->wpolicy_cb);
@ -381,9 +381,9 @@ list_prop_init(
n = 0;
item[n] = cgen->hgt_opmenu_items.Lines_item;
item_ptr[n] = SIZE_IN_CHARS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_CHARS_KEY; n++;
item[n] = cgen->hgt_opmenu_items.Pixels_item;
item_ptr[n] = SIZE_IN_PIXELS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_PIXELS_KEY; n++;
prop_options_init(&(pls->hgt_metric), cgen->hgt_opmenu_label,
cgen->hgt_opmenu,
cgen->hgt_opmenu_menu,

8
cde/programs/dtappbuilder/src/ab/pal_mainwin.c
View file

@ -275,9 +275,9 @@ mainwin_prop_init(
/* Resize Mode */
n = 0;
item[n] = cgen->resizemode_rbox_items.Adjustable_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
item[n] = cgen->resizemode_rbox_items.Fixed_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
prop_radiobox_init(&(pms->resize_mode), cgen->resizemode_rbox_label,
cgen->resizemode_rbox, n, item, item_ptr,
cgen->resizemode_cb);
@ -309,9 +309,9 @@ mainwin_prop_init(
/* Size Policy */
n = 0;
item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
item[n] = cgen->size_policy_rbox_items.Fixed_item;
item_ptr[n] = SIZE_FIXED_KEY; n++;
item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
prop_radiobox_init(&(pms->size_policy), cgen->size_policy_rbox_label,
cgen->size_policy_rbox, n, item, item_ptr,
cgen->size_policy_cb);

28
cde/programs/dtappbuilder/src/ab/pal_menu.c
View file

@ -339,9 +339,9 @@ menu_prop_init(
/* Tear-off */
n = 0;
item[n] = cgen->tearoff_rbox_items.Enabled_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
item[n] = cgen->tearoff_rbox_items.Disabled_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
prop_radiobox_init(&(pms->tearoff), cgen->tearoff_rbox_label,
cgen->tearoff_rbox, n, item, item_ptr,
cgen->tearoff_cb);
@ -368,11 +368,11 @@ menu_prop_init(
cgen->itemlabel_field, cgen->itemlist_cb);
n = 0;
item[n] = cgen->itemlabeltype_opmenu_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->itemlabeltype_opmenu_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
item[n] = cgen->itemlabeltype_opmenu_items.Separator_item;
item_ptr[n] = AB_LABEL_SEPARATOR; n++;
item_ptr[n] = (void *) AB_LABEL_SEPARATOR; n++;
prop_options_init(&(pms->item_label_type), cgen->itemlabeltype_opmenu_label,
cgen->itemlabeltype_opmenu, cgen->itemlabeltype_opmenu_menu,
n, item, item_ptr, cgen->itemlist_cb);
@ -392,23 +392,23 @@ menu_prop_init(
/* Item Line Style */
n = 0;
item[n] = cgen->linestyle_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_In_Dash_item;
item_ptr[n] = AB_LINE_ETCHED_IN_DASH; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN_DASH; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_Out_Dash_item;
item_ptr[n] = AB_LINE_ETCHED_OUT_DASH; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT_DASH; n++;
item[n] = cgen->linestyle_opmenu_items.Single_Line_item;
item_ptr[n] = AB_LINE_SINGLE_LINE; n++;
item_ptr[n] = (void *) AB_LINE_SINGLE_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Double_Line_item;
item_ptr[n] = AB_LINE_DOUBLE_LINE; n++;
item_ptr[n] = (void *) AB_LINE_DOUBLE_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Single_Dashed_Line_item;
item_ptr[n] = AB_LINE_SINGLE_DASHED_LINE; n++;
item_ptr[n] = (void *) AB_LINE_SINGLE_DASHED_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Double_Dashed_Line_item;
item_ptr[n] = AB_LINE_DOUBLE_DASHED_LINE; n++;
item_ptr[n] = (void *) AB_LINE_DOUBLE_DASHED_LINE; n++;
prop_options_init(&(pms->item_line_style), cgen->linestyle_opmenu_label,
cgen->linestyle_opmenu, cgen->linestyle_opmenu_menu,
n, item, item_ptr,

4
cde/programs/dtappbuilder/src/ab/pal_menubar.c
View file

@ -314,9 +314,9 @@ menubar_prop_init(
cgen->itemlabel_field, cgen->itemlist_cb);
n = 0;
item[n] = cgen->itemlabel_opmenu_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->itemlabel_opmenu_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pms->item_label_type), cgen->item_labeltype_label,
cgen->itemlabel_opmenu, cgen->itemlabel_opmenu_menu,
n, item, item_ptr, cgen->itemlist_cb);

24
cde/programs/dtappbuilder/src/ab/pal_scale.c
View file

@ -292,9 +292,9 @@ scale_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_opmenu_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_opmenu_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pss->label_type), cgen->labeltype_opmenu_label,
cgen->labeltype_opmenu,
cgen->labeltype_opmenu_menu,
@ -308,9 +308,9 @@ scale_prop_init(
n = 0;
item[n] = cgen->labelpos_opmenu_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
item[n] = cgen->labelpos_opmenu_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
prop_options_init(&(pss->label_pos), cgen->labelpos_opmenu_label,
cgen->labelpos_opmenu,
cgen->labelpos_opmenu_menu,
@ -320,9 +320,9 @@ scale_prop_init(
/* Scale Type */
n = 0;
item[n] = cgen->scaletype_rbox_items.Scale_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
item[n] = cgen->scaletype_rbox_items.Gauge_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
prop_radiobox_init(&(pss->scale_type), cgen->scaletype_rbox_label,
cgen->scaletype_rbox, n, item, item_ptr,
cgen->scaletype_cb);
@ -338,9 +338,9 @@ scale_prop_init(
/* Orientation */
n = 0;
item[n] = cgen->orient_rbox_items.Horizontal_item;
item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
item[n] = cgen->orient_rbox_items.Vertical_item;
item_ptr[n] = AB_ORIENT_VERTICAL; n++;
item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
prop_radiobox_init(&(pss->orient), cgen->orient_rbox_label,
cgen->orient_rbox, n, item, item_ptr,
cgen->orient_cb);
@ -352,13 +352,13 @@ scale_prop_init(
/* Direction */
n = 0;
item[n] = cgen->dir_opmenu_items.Left_to_Right_item;
item_ptr[n] = AB_DIR_LEFT_TO_RIGHT; n++;
item_ptr[n] = (void *) AB_DIR_LEFT_TO_RIGHT; n++;
item[n] = cgen->dir_opmenu_items.Right_to_Left_item;
item_ptr[n] = AB_DIR_RIGHT_TO_LEFT; n++;
item_ptr[n] = (void *) AB_DIR_RIGHT_TO_LEFT; n++;
item[n] = cgen->dir_opmenu_items.Top_to_Bottom_item;
item_ptr[n] = AB_DIR_TOP_TO_BOTTOM; n++;
item_ptr[n] = (void *) AB_DIR_TOP_TO_BOTTOM; n++;
item[n] = cgen->dir_opmenu_items.Bottom_to_Top_item;
item_ptr[n] = AB_DIR_BOTTOM_TO_TOP; n++;
item_ptr[n] = (void *) AB_DIR_BOTTOM_TO_TOP; n++;
prop_options_init(&(pss->dir), cgen->dir_opmenu_label,
cgen->dir_opmenu, cgen->dir_opmenu_menu,
n, item, item_ptr,

22
cde/programs/dtappbuilder/src/ab/pal_sep.c
View file

@ -255,9 +255,9 @@ separator_prop_init(
/* Orientation */
n = 0;
item[n] = cgen->orient_rbox_items.Horizontal_item;
item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
item[n] = cgen->orient_rbox_items.Vertical_item;
item_ptr[n] = AB_ORIENT_VERTICAL; n++;
item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
prop_radiobox_init(&(pss->orient), cgen->orient_rbox_label,
cgen->orient_rbox, n, item, item_ptr,
cgen->orient_cb);
@ -265,23 +265,23 @@ separator_prop_init(
/* Line Style */
n = 0;
item[n] = cgen->linestyle_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_In_Dash_item;
item_ptr[n] = AB_LINE_ETCHED_IN_DASH; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN_DASH; n++;
item[n] = cgen->linestyle_opmenu_items.Etched_Out_Dash_item;
item_ptr[n] = AB_LINE_ETCHED_OUT_DASH; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT_DASH; n++;
item[n] = cgen->linestyle_opmenu_items.Single_Line_item;
item_ptr[n] = AB_LINE_SINGLE_LINE; n++;
item_ptr[n] = (void *) AB_LINE_SINGLE_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Double_Line_item;
item_ptr[n] = AB_LINE_DOUBLE_LINE; n++;
item_ptr[n] = (void *) AB_LINE_DOUBLE_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Single_Dashed_Line_item;
item_ptr[n] = AB_LINE_SINGLE_DASHED_LINE; n++;
item_ptr[n] = (void *) AB_LINE_SINGLE_DASHED_LINE; n++;
item[n] = cgen->linestyle_opmenu_items.Double_Dashed_Line_item;
item_ptr[n] = AB_LINE_DOUBLE_DASHED_LINE; n++;
item_ptr[n] = (void *) AB_LINE_DOUBLE_DASHED_LINE; n++;
prop_options_init(&(pss->line_style), cgen->linestyle_opmenu_label,
cgen->linestyle_opmenu, cgen->linestyle_opmenu_menu,
n, item, item_ptr,

22
cde/programs/dtappbuilder/src/ab/pal_spinbox.c
View file

@ -293,9 +293,9 @@ spinbox_prop_init(
/* Spinbox Type */
n = 0;
item[n] = cgen->spinboxtype_rbox_items.Numeric_item;
item_ptr[n] = AB_TEXT_NUMERIC; n++;
item_ptr[n] = (void *) AB_TEXT_NUMERIC; n++;
item[n] = cgen->spinboxtype_rbox_items.String_List_item;
item_ptr[n] = AB_TEXT_DEFINED_STRING; n++;
item_ptr[n] = (void *) AB_TEXT_DEFINED_STRING; n++;
prop_radiobox_init(&(pss->spinbox_type), cgen->spinboxtype_rbox_label,
cgen->spinboxtype_rbox, n, item, item_ptr,
cgen->spinboxtype_cb);
@ -306,9 +306,9 @@ spinbox_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pss->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -321,9 +321,9 @@ spinbox_prop_init(
n = 0;
item[n] = cgen->labelpos_rbox_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
item[n] = cgen->labelpos_rbox_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
prop_options_init(&(pss->label_pos), cgen->labeltype_rbox_label,
cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
n, item, item_ptr,
@ -332,15 +332,15 @@ spinbox_prop_init(
/* Arrow Style */
n = 0;
item[n] = cgen->arrowstyle_opmenu_items.Flat_Beginning_item;
item_ptr[n] = AB_ARROW_FLAT_BEGIN; n++;
item_ptr[n] = (void *) AB_ARROW_FLAT_BEGIN; n++;
item[n] = cgen->arrowstyle_opmenu_items.Flat_End_item;
item_ptr[n] = AB_ARROW_FLAT_END; n++;
item_ptr[n] = (void *) AB_ARROW_FLAT_END; n++;
item[n] = cgen->arrowstyle_opmenu_items.Beginning_item;
item_ptr[n] = AB_ARROW_BEGIN; n++;
item_ptr[n] = (void *) AB_ARROW_BEGIN; n++;
item[n] = cgen->arrowstyle_opmenu_items.End_item;
item_ptr[n] = AB_ARROW_END; n++;
item_ptr[n] = (void *) AB_ARROW_END; n++;
item[n] = cgen->arrowstyle_opmenu_items.Split_item;
item_ptr[n] = AB_ARROW_SPLIT; n++;
item_ptr[n] = (void *) AB_ARROW_SPLIT; n++;
prop_options_init(&(pss->arrow_style), cgen->arrowstyle_opmenu_label,
cgen->arrowstyle_opmenu, cgen->arrowstyle_opmenu_menu,
n, item, item_ptr,

18
cde/programs/dtappbuilder/src/ab/pal_termp.c
View file

@ -267,9 +267,9 @@ termp_prop_init(
/* Scrolling */
n = 0;
item[n] = cgen->scroll_rbox_items.Never_item;
item_ptr[n] = AB_SCROLLBAR_NEVER; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_NEVER; n++;
item[n] = cgen->scroll_rbox_items.Always_item;
item_ptr[n] = AB_SCROLLBAR_ALWAYS; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_ALWAYS; n++;
prop_radiobox_init(&(pts->scrolling), cgen->scroll_rbox_label,
cgen->scroll_rbox, n, item, item_ptr,
cgen->scroll_cb);
@ -277,15 +277,15 @@ termp_prop_init(
/* Border Frame */
n = 0;
item[n] = cgen->bframe_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
item_ptr[n] = AB_LINE_SHADOW_IN; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
prop_options_init(&(pts->frame), cgen->bframe_opmenu_label,
cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
n, item, item_ptr,
@ -322,9 +322,9 @@ termp_prop_init(
n = 0;
item[n] = cgen->size_opmenu_items.Characters_item;
item_ptr[n] = SIZE_IN_CHARS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_CHARS_KEY; n++;
item[n] = cgen->size_opmenu_items.Pixels_item;
item_ptr[n] = SIZE_IN_PIXELS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_PIXELS_KEY; n++;
prop_options_init(&(pts->size_metric), cgen->size_opmenu_label,
cgen->size_opmenu,
cgen->size_opmenu_menu,

16
cde/programs/dtappbuilder/src/ab/pal_textf.c
View file

@ -259,9 +259,9 @@ textf_prop_init(
/* Label, Type, Position */
n = 0;
item[n] = cgen->labeltype_rbox_items.String_item;
item_ptr[n] = AB_LABEL_STRING; n++;
item_ptr[n] = (void *) AB_LABEL_STRING; n++;
item[n] = cgen->labeltype_rbox_items.Graphic_item;
item_ptr[n] = AB_LABEL_GLYPH; n++;
item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
prop_options_init(&(pts->label_type), cgen->labeltype_rbox_label,
cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
n, item, item_ptr,
@ -273,9 +273,9 @@ textf_prop_init(
n = 0;
item[n] = cgen->labelpos_rbox_items.Left_item;
item_ptr[n] = AB_CP_WEST; n++;
item_ptr[n] = (void *) AB_CP_WEST; n++;
item[n] = cgen->labelpos_rbox_items.Above_item;
item_ptr[n] = AB_CP_NORTH; n++;
item_ptr[n] = (void *) AB_CP_NORTH; n++;
prop_options_init(&(pts->label_pos), cgen->labelpos_rbox_label,
cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
n, item, item_ptr,
@ -291,9 +291,9 @@ textf_prop_init(
/* Operation */
n = 0;
item[n] = cgen->op_rbox_items.Editable_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
item[n] = cgen->op_rbox_items.Read_Only_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
prop_radiobox_init(&(pts->op), cgen->op_rbox_label,
cgen->op_rbox, n, item, item_ptr,
cgen->op_cb);
@ -322,9 +322,9 @@ textf_prop_init(
n = 0;
item[n] = cgen->width_opmenu_items.Characters_item;
item_ptr[n] = SIZE_IN_CHARS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_CHARS_KEY; n++;
item[n] = cgen->width_opmenu_items.Pixels_item;
item_ptr[n] = SIZE_IN_PIXELS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_PIXELS_KEY; n++;
prop_options_init(&(pts->size_metric), cgen->width_opmenu_label,
cgen->width_opmenu,
cgen->width_opmenu_menu,

22
cde/programs/dtappbuilder/src/ab/pal_textp.c
View file

@ -270,9 +270,9 @@ textp_prop_init(
/* Scrolling */
n = 0;
item[n] = cgen->scroll_rbox_items.Never_item;
item_ptr[n] = AB_SCROLLBAR_NEVER; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_NEVER; n++;
item[n] = cgen->scroll_rbox_items.Always_item;
item_ptr[n] = AB_SCROLLBAR_ALWAYS; n++;
item_ptr[n] = (void *) AB_SCROLLBAR_ALWAYS; n++;
prop_radiobox_init(&(pts->scrolling), cgen->scroll_rbox_label,
cgen->scroll_rbox, n, item, item_ptr,
cgen->scroll_cb);
@ -280,15 +280,15 @@ textp_prop_init(
/* Border Frame */
n = 0;
item[n] = cgen->bframe_opmenu_items.None_item;
item_ptr[n] = AB_LINE_NONE; n++;
item_ptr[n] = (void *) AB_LINE_NONE; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
item_ptr[n] = AB_LINE_SHADOW_IN; n++;
item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
item[n] = cgen->bframe_opmenu_items.Etched_In_item;
item_ptr[n] = AB_LINE_ETCHED_IN; n++;
item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
prop_options_init(&(pts->frame), cgen->bframe_opmenu_label,
cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
n, item, item_ptr,
@ -297,9 +297,9 @@ textp_prop_init(
/* Operation */
n = 0;
item[n] = cgen->op_rbox_items.Editable_item;
item_ptr[n] = False; n++;
item_ptr[n] = (void *) False; n++;
item[n] = cgen->op_rbox_items.Read_Only_item;
item_ptr[n] = True; n++;
item_ptr[n] = (void *) True; n++;
prop_radiobox_init(&(pts->op), cgen->op_rbox_label,
cgen->op_rbox, n, item, item_ptr,
cgen->op_cb);
@ -343,9 +343,9 @@ textp_prop_init(
n = 0;
item[n] = cgen->size_opmenu_items.Characters_item;
item_ptr[n] = SIZE_IN_CHARS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_CHARS_KEY; n++;
item[n] = cgen->size_opmenu_items.Pixels_item;
item_ptr[n] = SIZE_IN_PIXELS_KEY; n++;
item_ptr[n] = (void *) SIZE_IN_PIXELS_KEY; n++;
prop_options_init(&(pts->size_metric), cgen->size_opmenu_label,
cgen->size_opmenu,
cgen->size_opmenu_menu,

2
cde/programs/dtksh/ksh93/src/lib/libast/aso/aso.c
View file

@ -835,7 +835,7 @@ asocasptr(void volatile* p, void* o, void* n)
#if defined(_aso_casptr)
if (!state.lockf)
return _aso_casptr((void**)p, o, n);
return _aso_cas64((void**)p, o, n);
#endif
k = lock(state.data, 0, p);
if (*(void* volatile*)p == o)