projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+7AEB): Apply new conventions for glyph granularity.
[chise/xemacs-chise.git.1]
/
lwlib
/
lwlib-Xaw.c
diff --git
a/lwlib/lwlib-Xaw.c
b/lwlib/lwlib-Xaw.c
index
5544c24
..
2fe4dc9
100644
(file)
--- a/
lwlib/lwlib-Xaw.c
+++ b/
lwlib/lwlib-Xaw.c
@@
-46,10
+46,8
@@
Boston, MA 02111-1307, USA. */
#include "xlwradio.h"
#include "xlwcheckbox.h"
#include "xlwgauge.h"
#include "xlwradio.h"
#include "xlwcheckbox.h"
#include "xlwgauge.h"
-#ifndef NEED_MOTIF
#include ATHENA_AsciiText_h_
#endif
#include ATHENA_AsciiText_h_
#endif
-#endif
#include <X11/Xatom.h>
static void xaw_generic_callback (Widget, XtPointer, XtPointer);
#include <X11/Xatom.h>
static void xaw_generic_callback (Widget, XtPointer, XtPointer);
@@
-599,11
+597,14
@@
wm_delete_window (Widget shell, XtPointer closure, XtPointer call_data)
abort ();
XtSetArg (al [0], XtNchildren, &kids);
XtGetValues (shell, al, 1);
abort ();
XtSetArg (al [0], XtNchildren, &kids);
XtGetValues (shell, al, 1);
- if (!kids || !*kids)
- abort ();
- widget = kids [0];
- if (! XtIsSubclass (widget, dialogWidgetClass))
- abort ();
+ if (!kids || !*kids) abort ();
+
+ for (widget = *kids;
+ widget && ! XtIsSubclass (widget, dialogWidgetClass);
+ widget = *++kids)
+ ;
+ if (!widget) abort ();
+
id = lw_get_widget_id (widget);
if (! id) abort ();
id = lw_get_widget_id (widget);
if (! id) abort ();
@@
-838,7
+839,7
@@
xaw_create_progress (widget_instance *instance)
return scale;
}
return scale;
}
-#ifndef NEED_MOTIF
+#if defined(LWLIB_WIDGETS_ATHENA)
#define TEXT_BUFFER_SIZE 128
static Widget
xaw_create_text_field (widget_instance *instance)
#define TEXT_BUFFER_SIZE 128
static Widget
xaw_create_text_field (widget_instance *instance)
@@
-880,7
+881,7
@@
xaw_create_text_field (widget_instance *instance)
#endif /* LWLIB_WIDGETS_ATHENA */
#endif /* LWLIB_WIDGETS_ATHENA */
-widget_creation_entry
+const widget_creation_entry
xaw_creation_table [] =
{
#ifdef LWLIB_SCROLLBARS_ATHENA
xaw_creation_table [] =
{
#ifdef LWLIB_SCROLLBARS_ATHENA
@@
-890,9
+891,7
@@
xaw_creation_table [] =
#ifdef LWLIB_WIDGETS_ATHENA
{"button", xaw_create_button },
{ "label", xaw_create_label_field },
#ifdef LWLIB_WIDGETS_ATHENA
{"button", xaw_create_button },
{ "label", xaw_create_label_field },
-#ifndef NEED_MOTIF
{"text-field", xaw_create_text_field },
{"text-field", xaw_create_text_field },
-#endif
{"progress", xaw_create_progress },
#endif
{NULL, NULL}
{"progress", xaw_create_progress },
#endif
{NULL, NULL}