Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/lwlib/lwlib-Xaw.c Mon Aug 13 11:30:00 2007 +0200 +++ b/lwlib/lwlib-Xaw.c Mon Aug 13 11:30:53 2007 +0200 @@ -33,21 +33,21 @@ #include <X11/Shell.h> #ifdef LWLIB_SCROLLBARS_ATHENA -#include <X11/Xaw/Scrollbar.h> +#include ATHENA_INCLUDE(Scrollbar.h) #endif #ifdef LWLIB_DIALOGS_ATHENA -#include <X11/Xaw/Dialog.h> -#include <X11/Xaw/Form.h> -#include <X11/Xaw/Command.h> -#include <X11/Xaw/Label.h> +#include ATHENA_INCLUDE(Dialog.h) +#include ATHENA_INCLUDE(Form.h) +#include ATHENA_INCLUDE(Command.h) +#include ATHENA_INCLUDE(Label.h) #endif #ifdef LWLIB_WIDGETS_ATHENA -#include <X11/Xaw/Toggle.h> +#include ATHENA_INCLUDE(Toggle.h) #include "xlwradio.h" #include "xlwcheckbox.h" #include "xlwgauge.h" #ifndef NEED_MOTIF -#include <X11/Xaw/AsciiText.h> +#include ATHENA_INCLUDE(AsciiText.h) #endif #endif #include <X11/Xatom.h> @@ -126,8 +126,8 @@ xaw_update_one_widget (widget_instance *instance, Widget widget, widget_value *val, Boolean deep_p) { - if (val->nargs) - XtSetValues (widget, val->args, val->nargs); + if (val->args && val->args->nargs) + XtSetValues (widget, val->args->args, val->args->nargs); if (0) ; @@ -146,7 +146,7 @@ } #endif /* LWLIB_DIALOGS_ATHENA */ #ifdef LWLIB_WIDGETS_ATHENA - else if (XtClass (widget) == labelWidgetClass) + else if (XtIsSubclass (widget, labelWidgetClass)) { Arg al [1]; XtSetArg (al [0], XtNlabel, val->value);