--- a/lwlib/lwlib-Xlw.c	Tue Oct 28 10:38:26 2008 +0900
+++ b/lwlib/lwlib-Xlw.c	Wed Oct 29 03:37:16 2008 +0900
@@ -122,7 +122,7 @@
   Arg al [1];
   Widget widget;
   
-  Xt_SET_ARG (al [0], XtNmenu, instance->info->val);
+  XtSetArg (al [0], XtNmenu, instance->info->val);
   widget = XtCreateWidget (instance->info->name, xlwMenuWidgetClass,
 			   instance->parent, al, 1);
   XtAddCallback (widget, XtNopen,   pre_hook,  (XtPointer)instance);
@@ -139,8 +139,8 @@
   popup_shell = XtCreatePopupShell (instance->info->name,
 				    overrideShellWidgetClass,
 				    instance->parent, NULL, 0);
-  Xt_SET_ARG (al [0], XtNmenu, instance->info->val);
-  Xt_SET_ARG (al [1], XtNhorizontal, False);
+  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);
@@ -234,20 +234,20 @@
 
   callbacks[0].closure  = (XtPointer) instance;
 
-  Xt_SET_ARG (al[ac], XmNminimum,       1); ac++;
-  Xt_SET_ARG (al[ac], XmNmaximum, INT_MAX); ac++;
-  Xt_SET_ARG (al[ac], XmNincrement,     1); ac++;
-  Xt_SET_ARG (al[ac], XmNpageIncrement, 1); ac++;
-  Xt_SET_ARG (al[ac], XmNorientation, (vertical ? XmVERTICAL : XmHORIZONTAL)); ac++;
+  XtSetArg (al[ac], XmNminimum,       1); ac++;
+  XtSetArg (al[ac], XmNmaximum, INT_MAX); ac++;
+  XtSetArg (al[ac], XmNincrement,     1); ac++;
+  XtSetArg (al[ac], XmNpageIncrement, 1); ac++;
+  XtSetArg (al[ac], XmNorientation, (vertical ? XmVERTICAL : XmHORIZONTAL)); ac++;
 
-  Xt_SET_ARG (al[ac], XmNdecrementCallback,	callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNdragCallback,		callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNincrementCallback,	callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNpageDecrementCallback,	callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNpageIncrementCallback,	callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNtoBottomCallback,	callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNtoTopCallback,		callbacks); ac++;
-  Xt_SET_ARG (al[ac], XmNvalueChangedCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNdecrementCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNdragCallback,		callbacks); ac++;
+  XtSetArg (al[ac], XmNincrementCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNpageDecrementCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNpageIncrementCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNtoBottomCallback,	callbacks); ac++;
+  XtSetArg (al[ac], XmNtoTopCallback,		callbacks); ac++;
+  XtSetArg (al[ac], XmNvalueChangedCallback,	callbacks); ac++;
 
   return XtCreateWidget (instance->info->name, xlwScrollBarWidgetClass,
 			 instance->parent, al, ac);
@@ -278,15 +278,15 @@
       Arg al [4];
 
       /* First size and position the scrollbar widget. */
-      Xt_SET_ARG (al [0], XtNx,      data->scrollbar_x);
-      Xt_SET_ARG (al [1], XtNy,      data->scrollbar_y);
-      Xt_SET_ARG (al [2], XtNwidth,  data->scrollbar_width);
-      Xt_SET_ARG (al [3], XtNheight, data->scrollbar_height);
+      XtSetArg (al [0], XtNx,      data->scrollbar_x);
+      XtSetArg (al [1], XtNy,      data->scrollbar_y);
+      XtSetArg (al [2], XtNwidth,  data->scrollbar_width);
+      XtSetArg (al [3], XtNheight, data->scrollbar_height);
       XtSetValues (widget, al, 4);
 
       /* Now size the scrollbar's slider. */
-      Xt_SET_ARG (al [0], XmNsliderSize, &widget_sliderSize);
-      Xt_SET_ARG (al [1], XmNvalue,      &widget_val);
+      XtSetArg (al [0], XmNsliderSize, &widget_sliderSize);
+      XtSetArg (al [1], XmNvalue,      &widget_val);
       XtGetValues (widget, al, 2);
 
       percent = (double) data->slider_size /
@@ -382,9 +382,9 @@
   Widget tab = 0;
   widget_value* val = instance->info->val;
 
-  Xt_SET_ARG (al [ac], XtNsensitive, val->enabled);		ac++;
-  Xt_SET_ARG (al [ac], XtNmappedWhenManaged, False);		ac++;
-  Xt_SET_ARG (al [ac], XtNorientation, XtorientHorizontal);	ac++;
+  XtSetArg (al [ac], XtNsensitive, val->enabled);		ac++;
+  XtSetArg (al [ac], XtNmappedWhenManaged, False);		ac++;
+  XtSetArg (al [ac], XtNorientation, XtorientHorizontal);	ac++;
 
   /* add any args the user supplied for creation time */
   lw_add_value_args_to_args (val, al, &ac);
@@ -406,7 +406,7 @@
   Arg al[1];
 
   /* Children are always invisible, don't permit resizing. */
-  Xt_SET_ARG (al[0], XtNresizable, False);
+  XtSetArg (al[0], XtNresizable, False);
 
   for (cur = val; cur; cur = cur->next)
     {
@@ -479,8 +479,8 @@
   Widget clip = 0;
   widget_value* val = instance->info->val;
 
-  Xt_SET_ARG (al [ac], XtNmappedWhenManaged, False);	ac++;
-  Xt_SET_ARG (al [ac], XtNsensitive, True);		ac++;
+  XtSetArg (al [ac], XtNmappedWhenManaged, False);	ac++;
+  XtSetArg (al [ac], XtNsensitive, True);		ac++;
   /* add any args the user supplied for creation time */
   lw_add_value_args_to_args (val, al, &ac);
 
@@ -557,11 +557,13 @@
   else if (class_ == xlwMenuWidgetClass)
     {
       XlwMenuWidget mw;
+      Arg al [1];
       if (XtIsShell (widget))
 	mw = (XlwMenuWidget)((CompositeWidget)widget)->composite.children [0];
       else
 	mw = (XlwMenuWidget)widget;
-      Xt_SET_VALUE (widget, XtNmenu, val); /* #### mw unused! */
+      XtSetArg (al [0], XtNmenu, val);
+      XtSetValues (widget, al, 1); /* #### mw unused! */
     }
 #endif
 #ifdef LWLIB_SCROLLBARS_LUCID