From 0d92904b0605b9f83987757213a73a33318b68b4 Mon Sep 17 00:00:00 2001 From: Liang Chang Date: Wed, 17 Feb 2021 08:08:16 +0800 Subject: [PATCH] dtappbuilder: fix issues of property settings for control pane. --- cde/programs/dtappbuilder/src/ab/pal_cpanel.c | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cde/programs/dtappbuilder/src/ab/pal_cpanel.c b/cde/programs/dtappbuilder/src/ab/pal_cpanel.c index 011b39b6c..d8930fd1b 100644 --- a/cde/programs/dtappbuilder/src/ab/pal_cpanel.c +++ b/cde/programs/dtappbuilder/src/ab/pal_cpanel.c @@ -210,7 +210,8 @@ cpanel_prop_init( DtbRevolvPropDialogInfo rpd = &(dtb_revolv_prop_dialog); PropCPanelSettingsRec *pcs = &(prop_cpanel_settings_rec[type]); Widget item[10]; - int item_val[10]; + XtArgVal item_val[10]; + XtPointer item_ptr[10]; int i, n; if (type == AB_PROP_REVOLVING) @@ -279,18 +280,18 @@ cpanel_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(&(pcs->frame), cgen->bframe_opmenu_label, cgen->bframe_opmenu, cgen->bframe_opmenu_menu, - n, item, (XtPointer*)item_val, + n, item, item_ptr, cgen->bframe_cb); /* Menu Title */ @@ -307,11 +308,11 @@ cpanel_prop_init( /* Size Policy */ n = 0; item[n] = cgen->size_policy_rbox_items.Fit_Contents_item; - item_val[n] = SIZE_OF_CONTENTS_KEY; n++; + item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++; item[n] = cgen->size_policy_rbox_items.Fixed_item; - item_val[n] = SIZE_FIXED_KEY; n++; + item_ptr[n] = SIZE_FIXED_KEY; n++; prop_radiobox_init(&(pcs->size_policy), cgen->size_policy_rbox_label, - cgen->size_policy_rbox, n, item, (XtPointer*)item_val, + cgen->size_policy_rbox, n, item, item_ptr, cgen->size_policy_cb); for(i=0; i < n; i++)