comparison lwlib/lwlib-Xaw.c @ 434:9d177e8d4150 r21-2-25

Import from CVS: tag r21-2-25
author cvs
date Mon, 13 Aug 2007 11:30:53 +0200
parents 3ecd8885ac67
children 84b14dcb0985
comparison
equal deleted inserted replaced
433:892ca416f0fb 434:9d177e8d4150
31 #include <X11/IntrinsicP.h> 31 #include <X11/IntrinsicP.h>
32 #include <X11/CoreP.h> 32 #include <X11/CoreP.h>
33 #include <X11/Shell.h> 33 #include <X11/Shell.h>
34 34
35 #ifdef LWLIB_SCROLLBARS_ATHENA 35 #ifdef LWLIB_SCROLLBARS_ATHENA
36 #include <X11/Xaw/Scrollbar.h> 36 #include ATHENA_INCLUDE(Scrollbar.h)
37 #endif 37 #endif
38 #ifdef LWLIB_DIALOGS_ATHENA 38 #ifdef LWLIB_DIALOGS_ATHENA
39 #include <X11/Xaw/Dialog.h> 39 #include ATHENA_INCLUDE(Dialog.h)
40 #include <X11/Xaw/Form.h> 40 #include ATHENA_INCLUDE(Form.h)
41 #include <X11/Xaw/Command.h> 41 #include ATHENA_INCLUDE(Command.h)
42 #include <X11/Xaw/Label.h> 42 #include ATHENA_INCLUDE(Label.h)
43 #endif 43 #endif
44 #ifdef LWLIB_WIDGETS_ATHENA 44 #ifdef LWLIB_WIDGETS_ATHENA
45 #include <X11/Xaw/Toggle.h> 45 #include ATHENA_INCLUDE(Toggle.h)
46 #include "xlwradio.h" 46 #include "xlwradio.h"
47 #include "xlwcheckbox.h" 47 #include "xlwcheckbox.h"
48 #include "xlwgauge.h" 48 #include "xlwgauge.h"
49 #ifndef NEED_MOTIF 49 #ifndef NEED_MOTIF
50 #include <X11/Xaw/AsciiText.h> 50 #include ATHENA_INCLUDE(AsciiText.h)
51 #endif 51 #endif
52 #endif 52 #endif
53 #include <X11/Xatom.h> 53 #include <X11/Xatom.h>
54 54
55 static void xaw_generic_callback (Widget, XtPointer, XtPointer); 55 static void xaw_generic_callback (Widget, XtPointer, XtPointer);
124 124
125 void 125 void
126 xaw_update_one_widget (widget_instance *instance, Widget widget, 126 xaw_update_one_widget (widget_instance *instance, Widget widget,
127 widget_value *val, Boolean deep_p) 127 widget_value *val, Boolean deep_p)
128 { 128 {
129 if (val->nargs) 129 if (val->args && val->args->nargs)
130 XtSetValues (widget, val->args, val->nargs); 130 XtSetValues (widget, val->args->args, val->args->nargs);
131 131
132 if (0) 132 if (0)
133 ; 133 ;
134 #ifdef LWLIB_SCROLLBARS_ATHENA 134 #ifdef LWLIB_SCROLLBARS_ATHENA
135 else if (XtIsSubclass (widget, scrollbarWidgetClass)) 135 else if (XtIsSubclass (widget, scrollbarWidgetClass))
144 XtSetArg (al [0], XtNlabel, val->contents->value); 144 XtSetArg (al [0], XtNlabel, val->contents->value);
145 XtSetValues (widget, al, 1); 145 XtSetValues (widget, al, 1);
146 } 146 }
147 #endif /* LWLIB_DIALOGS_ATHENA */ 147 #endif /* LWLIB_DIALOGS_ATHENA */
148 #ifdef LWLIB_WIDGETS_ATHENA 148 #ifdef LWLIB_WIDGETS_ATHENA
149 else if (XtClass (widget) == labelWidgetClass) 149 else if (XtIsSubclass (widget, labelWidgetClass))
150 { 150 {
151 Arg al [1]; 151 Arg al [1];
152 XtSetArg (al [0], XtNlabel, val->value); 152 XtSetArg (al [0], XtNlabel, val->value);
153 XtSetValues (widget, al, 1); 153 XtSetValues (widget, al, 1);
154 } 154 }