X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lwlib%2Flwlib-Xlw.c;h=150e168966bc24ab220df122020ba1fc9d5f293f;hb=d04e2c736d607dcd9f10373c6eedd1618b5a491a;hp=8063c7caa121b5be380e4f9844561c8df1699d5f;hpb=ea21eb75bbf90355514d65686bd53bea579f8e23;p=chise%2Fxemacs-chise.git-

diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 8063c7c..150e168 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -49,9 +49,15 @@ Boston, MA 02111-1307, USA.  */
 #include "../src/xmu.h"
 #include "xlwtabs.h"
 #endif
-
 
 
+#include <X11/Intrinsic.h>
+#include <X11/StringDefs.h>
+#include <X11/Shell.h>
+#include <X11/Xaw/Form.h>
+#include <X11/Xaw/Command.h>
+
+
 #ifdef LWLIB_MENUBARS_LUCID
 
 /* Menu callbacks */
@@ -142,9 +148,8 @@ xlw_create_popup_menu (widget_instance* instance)
   XtSetArg (al [0], XtNmenu, instance->info->val);
   XtSetArg (al [1], XtNhorizontal, False);
   widget = XtCreateManagedWidget ("popup", xlwMenuWidgetClass,
-				  popup_shell, al, 2);
-  XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance);
-
+  			 popup_shell, al, 2);
+  XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance);  
   return popup_shell;
 }
 #endif /* LWLIB_MENUBARS_LUCID */
@@ -482,7 +487,7 @@ xlw_create_clip_window (widget_instance *instance)
 }
 #endif
 
-widget_creation_entry 
+const widget_creation_entry 
 xlw_creation_table [] =
 {
 #ifdef LWLIB_MENUBARS_LUCID
@@ -549,7 +554,7 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
       else
 	mw = (XlwMenuWidget)widget;
       XtSetArg (al [0], XtNmenu, val);
-      XtSetValues (widget, al, 1);
+      XtSetValues (widget, al, 1); /* #### mw unused! */
     }
 #endif
 #ifdef LWLIB_SCROLLBARS_LUCID
@@ -564,6 +569,9 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
       xlw_update_tab_control (instance, widget, val);
     }
 #endif
+  /* Lastly update our global arg values. */
+  if (val->args && val->args->nargs)
+    XtSetValues (widget, val->args->args, val->args->nargs);
 }
 
 void