From 471afeaa2c4683e75fc18842068f7060b6014358 Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Wed, 17 Feb 2021 18:17:04 +0800 Subject: [PATCH] dtappbuilder: fix issues of property settings for group. --- cde/programs/dtappbuilder/src/ab/pal_group.c | 49 ++++++++++---------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/pal_group.c b/cde/programs/dtappbuilder/src/ab/pal_group.c index 8e6e61a98..570f7b2c5 100644 --- a/cde/programs/dtappbuilder/src/ab/pal_group.c +++ b/cde/programs/dtappbuilder/src/ab/pal_group.c @@ -669,7 +669,8 @@ group_prop_init( DtbRevolvPropDialogInfo rpd = &(dtb_revolv_prop_dialog); PropGroupSettingsRec *pgs = &(prop_group_settings_rec[type]); Widget item[10]; - int item_val[10]; + XtArgVal item_val[10]; + XtPointer item_ptr[10]; int n; int i; @@ -740,32 +741,32 @@ group_prop_init( /* Border Frame Setting */ n = 0; item[n] = cgen->bframe_opmenu_items.None_item; - item_val[n] = AB_LINE_NONE; n++; + item_ptr[n] = AB_LINE_NONE; n++; item[n] = cgen->bframe_opmenu_items.Shadow_Out_item; - item_val[n] = AB_LINE_SHADOW_OUT; n++; + item_ptr[n] = AB_LINE_SHADOW_OUT; n++; item[n] = cgen->bframe_opmenu_items.Shadow_In_item; - item_val[n] = AB_LINE_SHADOW_IN; n++; + item_ptr[n] = AB_LINE_SHADOW_IN; n++; item[n] = cgen->bframe_opmenu_items.Etched_Out_item; - item_val[n] = AB_LINE_ETCHED_OUT; n++; + item_ptr[n] = AB_LINE_ETCHED_OUT; n++; item[n] = cgen->bframe_opmenu_items.Etched_In_item; - item_val[n] = AB_LINE_ETCHED_IN; n++; + item_ptr[n] = AB_LINE_ETCHED_IN; n++; prop_options_init(&(pgs->frame), cgen->bframe_opmenu_label, cgen->bframe_opmenu, cgen->bframe_opmenu_menu, - n, item, (XtPointer*)item_val, + n, item, item_ptr, cgen->bframe_cb); /* Layout Type */ n = 0; item[n] = cgen->layout_rbox_items.bitmaps_ggp_as_is_xbm_item; - item_val[n] = AB_GROUP_IGNORE; n++; + item_ptr[n] = AB_GROUP_IGNORE; n++; item[n] = cgen->layout_rbox_items.bitmaps_ggp_col_xbm_item; - item_val[n] = AB_GROUP_COLUMNS; n++; + item_ptr[n] = AB_GROUP_COLUMNS; n++; item[n] = cgen->layout_rbox_items.bitmaps_ggp_row_xbm_item; - item_val[n] = AB_GROUP_ROWS; n++; + item_ptr[n] = AB_GROUP_ROWS; n++; item[n] = cgen->layout_rbox_items.bitmaps_ggp_rowcol_xbm_item; - item_val[n] = AB_GROUP_ROWSCOLUMNS; n++; + item_ptr[n] = AB_GROUP_ROWSCOLUMNS; n++; prop_radiobox_init(&(pgs->layout_type), cgen->layout_rbox_label, - cgen->layout_rbox, n, item, (XtPointer*)item_val, + cgen->layout_rbox, n, item, item_ptr, cgen->layout_cb1); for (i=0; i < n; i++) @@ -779,11 +780,11 @@ group_prop_init( /* Grid Row/Columns */ n = 0; item[n] = cgen->gridrowcol_rbox_items.Rows_item; - item_val[n] = AB_ORIENT_HORIZONTAL; n++; + item_ptr[n] = AB_ORIENT_HORIZONTAL; n++; item[n] = cgen->gridrowcol_rbox_items.Columns_item; - item_val[n] = AB_ORIENT_VERTICAL; n++; + item_ptr[n] = AB_ORIENT_VERTICAL; n++; prop_radiobox_init(&(pgs->grid_rowcol), NULL, - cgen->gridrowcol_rbox, n, item, (XtPointer*)item_val, + cgen->gridrowcol_rbox, n, item, item_ptr, cgen->gridrowcol_cb); /* Grid Row/Column count */ @@ -793,16 +794,16 @@ group_prop_init( /* Vertical Alignment */ n = 0; item[n] = cgen->valign_opmenu_items.bitmaps_align_left_xbm_item; - item_val[n] = AB_ALIGN_LEFT; n++; + item_ptr[n] = AB_ALIGN_LEFT; n++; item[n] = cgen->valign_opmenu_items.bitmaps_align_labels_xbm_item; - item_val[n] = AB_ALIGN_LABELS; n++; + item_ptr[n] = AB_ALIGN_LABELS; n++; item[n] = cgen->valign_opmenu_items.bitmaps_align_vcenter_xbm_item; - item_val[n] = AB_ALIGN_VCENTER; n++; + item_ptr[n] = AB_ALIGN_VCENTER; n++; item[n] = cgen->valign_opmenu_items.bitmaps_align_right_xbm_item; - item_val[n] = AB_ALIGN_RIGHT; n++; + item_ptr[n] = AB_ALIGN_RIGHT; n++; prop_options_init(&(pgs->valign), cgen->valign_opmenu_label, cgen->valign_opmenu, cgen->valign_opmenu_menu, - n, item, (XtPointer*)item_val, + n, item, item_ptr, cgen->valign_cb); /* Vertical spacing value */ @@ -812,14 +813,14 @@ group_prop_init( /* Horizontal Alignment */ n = 0; item[n] = cgen->halign_opmenu_items.bitmaps_align_top_xbm_item; - item_val[n] = AB_ALIGN_TOP; n++; + item_ptr[n] = AB_ALIGN_TOP; n++; item[n] = cgen->halign_opmenu_items.bitmaps_align_hcenter_xbm_item; - item_val[n] = AB_ALIGN_HCENTER; n++; + item_ptr[n] = AB_ALIGN_HCENTER; n++; item[n] = cgen->halign_opmenu_items.bitmaps_align_bottom_xbm_item; - item_val[n] = AB_ALIGN_BOTTOM; n++; + item_ptr[n] = AB_ALIGN_BOTTOM; n++; prop_options_init(&(pgs->halign), cgen->halign_opmenu_label, cgen->halign_opmenu, cgen->halign_opmenu_menu, - n, item, (XtPointer*)item_val, + n, item, item_ptr, cgen->halign_cb); /* Horizontal spacing value */