From e1f9b57844b8c0223cb15cf420922d40730c4338 Mon Sep 17 00:00:00 2001 From: Marcin Cieslak Date: Wed, 26 Sep 2012 12:14:52 +0200 Subject: [PATCH] dtstyle: XVaGetValues() calls --- cde/programs/dtstyle/Font.c | 3 ++- cde/programs/dtstyle/I18nMain.c | 9 ++++++--- cde/programs/dtstyle/Screen.c | 12 +++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c index 777d41be..0d6ba0c0 100644 --- a/cde/programs/dtstyle/Font.c +++ b/cde/programs/dtstyle/Font.c @@ -452,7 +452,8 @@ ButtonCB( { DtDialogBoxCallbackStruct *cb = (DtDialogBoxCallbackStruct *) call_data; - int n, len, items; + int n, len; + XtArgVal items; char *str, *fntstr, *fntsetstr; Arg args[MAX_ARGS]; char fontres[8192]; diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c index cea3c9f6..315f2c5e 100644 --- a/cde/programs/dtstyle/I18nMain.c +++ b/cde/programs/dtstyle/I18nMain.c @@ -825,7 +825,8 @@ UpdateImList( I18nEnv *env, char *hostname) { - Cardinal n,i; + Cardinal i; + XtArgVal n; Widget *im_tog = NULL; int ret = NoError; @@ -992,7 +993,8 @@ SaveSelectedValues( { int ret = NoError; char *preeditStr = NULL, *tmpStr; - int i, num_preedit = 0; + int i; + XtArgVal num_preedit = 0; XmStringTable list_preedit; static char preeditTypeRes[1024]; @@ -1068,7 +1070,8 @@ SetFileSelValues( ) { char *hostname; - Cardinal n,i; + Cardinal i; + XtArgVal n; Widget *im_tog; /* The hostname value is stored in the ImsSel structure. */ diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c index 00a5e00a..248a65b7 100644 --- a/cde/programs/dtstyle/Screen.c +++ b/cde/programs/dtstyle/Screen.c @@ -507,6 +507,7 @@ build_screenDialog( Dimension LabelWidth = 0; Atom delete_window_atom; Boolean low_res = False; + XtArgVal scratch; /* initialize saver data */ savers.shadow = 2; @@ -820,7 +821,8 @@ build_screenDialog( XtSetArg (args[n], XmNwidth, SAVER_WIDTH); n++; } screen.saverArea = XmCreateDrawingArea (screen.saverAreaFrame, "saverArea", args, n); /* get the initial secondary color pixel value for dtstyle for later use */ - XtVaGetValues(screen.saverArea, XmNbackground, &savers.bg, NULL); + XtVaGetValues(screen.saverArea, XmNbackground, &scratch, NULL); + savers.bg = (Pixel)scratch; /* label for the previewed saver */ n = 0; @@ -2396,6 +2398,7 @@ ButtonCB( Boolean flag; static char screenres[48]; int mintime; + XtArgVal scratch; DtDialogBoxCallbackStruct *cb = (DtDialogBoxCallbackStruct *) call_data; @@ -2482,7 +2485,8 @@ ButtonCB( free_saverList(savers.selsaverActionNames, savers.selsaverCount); savers.selsaverActionNames = NULL; - XtVaGetValues(screen.cycleTimeScale, XmNvalue, &screen.cycleTimeout, NULL); + XtVaGetValues(screen.cycleTimeScale, XmNvalue, &scratch, NULL); + screen.cycleTimeout = scratch; /* send new saver time, lock time and time per saver to SM if they have changed, */ /* flag value indicates which value has changed */ @@ -2610,6 +2614,7 @@ no_svr_ext_ButtonCB( Boolean flag; static char screenres[48]; int mintime; + XtArgVal scratch; DtDialogBoxCallbackStruct *cb = (DtDialogBoxCallbackStruct *) call_data; @@ -2686,7 +2691,8 @@ no_svr_ext_ButtonCB( free_saverList(savers.selsaverActionNames, savers.selsaverCount); savers.selsaverActionNames = NULL; - XtVaGetValues(screen.cycleTimeScale, XmNvalue, &screen.cycleTimeout, NULL); + XtVaGetValues(screen.cycleTimeScale, XmNvalue, &scratch, NULL); + screen.cycleTimeout = scratch; /* send new saver time, lock time and time per saver to SM if they have changed, */ /* flag value indicates which value has changed */ -- 2.25.1