X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lwlib%2Flwlib-Xlw.c;h=92437d50d67526547df59b421f37c245259ae7f4;hb=714c9ac699df4f93cc9d9a1b5ac4bd04159beb9c;hp=6c3cd342eae0dbe145948fd16cd0fcb70ab331c2;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git

diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index 6c3cd34..92437d5 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -482,7 +482,7 @@ xlw_create_clip_window (widget_instance *instance)
 }
 #endif
 
-widget_creation_entry 
+const widget_creation_entry 
 xlw_creation_table [] =
 {
 #ifdef LWLIB_MENUBARS_LUCID
@@ -524,6 +524,10 @@ lw_lucid_widget_p (Widget widget)
       XtClass (((CompositeWidget)widget)->composite.children [0])
 	== xlwMenuWidgetClass;
 #endif
+#ifdef HAVE_WIDGETS
+  if (the_class == emacsManagerWidgetClass)
+    return True;
+#endif
   return False;
 }
 
@@ -545,7 +549,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
@@ -560,6 +564,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