X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lwlib%2Flwlib-Xaw.c;h=3ff94607c042c781de27adc9ec0de6e4078fde74;hp=77aeb48b5b9856aa4029bb5b5f6dfe85c902077a;hb=3e447015251ce6dcde843cbed10d9033d5538622;hpb=46f51e794ddb493a8a76ec2f3be00b41e3b0be22

diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 77aeb48..3ff9460 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -146,7 +146,7 @@ xaw_update_one_widget (widget_instance *instance, Widget widget,
       }
 #endif /* LWLIB_DIALOGS_ATHENA */
 #ifdef LWLIB_WIDGETS_ATHENA
-  else if (XtIsSubclass (widget, labelWidgetClass))
+  else if (XtClass (widget) == labelWidgetClass)
       {
 	Arg al [1];
 	XtSetArg (al [0], XtNlabel, val->value);
@@ -329,8 +329,8 @@ static XtActionsRec xaw_actions [] = {
 static Boolean actions_initted = False;
 
 static Widget
-make_dialog (CONST char* name, Widget parent, Boolean pop_up_p,
-	     CONST char* shell_title, CONST char* icon_name,
+make_dialog (const char* name, Widget parent, Boolean pop_up_p,
+	     const char* shell_title, const char* icon_name,
              Boolean text_input_slot,
 	     Boolean radio_box, Boolean list,
 	     int left_buttons, int right_buttons)
@@ -438,8 +438,8 @@ xaw_create_dialog (widget_instance* instance)
   Widget parent = instance->parent;
   Widget widget;
   Boolean pop_up_p = instance->pop_up_p;
-  CONST char *shell_name = 0;
-  CONST char *icon_name = 0;
+  const char *shell_name = 0;
+  const char *icon_name = 0;
   Boolean text_input_slot = False;
   Boolean radio_box = False;
   Boolean list = False;