This commit was generated by cvs2svn to compensate for changes in r5121,

[chise/xemacs-chise.git.1] / lwlib / lwlib-Xaw.c

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index ff8771a..a52b231 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"
-#ifndef NEED_MOTIF
 #include ATHENA_AsciiText_h_
 #endif
-#endif
 #include <X11/Xatom.h>
 
 static void xaw_generic_callback (Widget, XtPointer, XtPointer);
@@ -179,6 +177,7 @@ xaw_update_one_widget (widget_instance *instance, Widget widget,
        }
 #endif /* ! LWLIB_DIALOGS_ATHENA3D */
 
+      lw_remove_accelerator_spec (val->value);
       XtSetArg (al [0], XtNlabel,     val->value);
       XtSetArg (al [1], XtNsensitive, val->enabled);
       /* Force centered button text.  See above. */
@@ -837,7 +836,7 @@ xaw_create_progress (widget_instance *instance)
   return scale;
 }
 
-#ifndef NEED_MOTIF
+#if defined(LWLIB_WIDGETS_ATHENA)
 #define TEXT_BUFFER_SIZE 128
 static Widget
 xaw_create_text_field (widget_instance *instance)
@@ -879,7 +878,7 @@ xaw_create_text_field (widget_instance *instance)
 
 #endif /* LWLIB_WIDGETS_ATHENA */
 
-widget_creation_entry
+const widget_creation_entry
 xaw_creation_table [] =
 {
 #ifdef LWLIB_SCROLLBARS_ATHENA
@@ -889,9 +888,7 @@ xaw_creation_table [] =
 #ifdef LWLIB_WIDGETS_ATHENA
   {"button",           xaw_create_button               },
   { "label",           xaw_create_label_field          },
-#ifndef NEED_MOTIF
   {"text-field",               xaw_create_text_field           },
-#endif
   {"progress",         xaw_create_progress             },
 #endif
   {NULL, NULL}