X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Flwlib-Xm.c;h=28dc5f86e2d3adcc7b6d2858b9ac6b05ae8f3f54;hb=6c06ab30ebf628394d2749043f30ed08488fbf2f;hp=76d893d70e75e233f8f46f2377cd720b5f1b644a;hpb=a7bf8d60d66c38f62928b171842d1b45d4539077;p=chise%2Fxemacs-chise.git-

diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 76d893d..28dc5f8 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -219,6 +219,10 @@ xm_update_label (widget_instance* instance, Widget widget, widget_value* val)
 
   if (val->value)
     {
+      /* #### Temporary fix. I though Motif was supposed to grok %_
+         type things. */
+      lw_remove_accelerator_spec (val->value);
+  
 #ifdef LWLIB_DIALOGS_MOTIF
       /*
        * Sigh.  The main text of a label is the name field for menubar
@@ -255,18 +259,18 @@ xm_update_label (widget_instance* instance, Widget widget, widget_value* val)
 	    {
 	      name_string =
 		XmStringCreateLtoR (res_name, XmSTRING_DEFAULT_CHARSET);
-	      
+
 	      value_name = XtMalloc (strlen (val->value) + 2);
 	      *value_name = 0;
 	      strcat (value_name, " ");
 	      strcat (value_name, val->value);
-	      
+
 	      val_string =
 		XmStringCreateLtoR (value_name, XmSTRING_DEFAULT_CHARSET);
-	      
+
 	      built_string =
 		XmStringConcat (name_string, val_string);
-	      
+
 	      XtFree (value_name);
 	    }
 	}
@@ -927,7 +931,7 @@ xm_update_one_value (widget_instance* instance, Widget widget,
 	  val->edited = True;
 	}
     }
-  else if (class == xmListWidgetClass 
+  else if (class == xmListWidgetClass
 #if defined (LWLIB_WIDGETS_MOTIF) && XmVERSION > 1
 	   || class == xmComboBoxWidgetClass
 #endif
@@ -1140,7 +1144,7 @@ make_dialog (char* name, Widget parent, Boolean pop_up_p,
       n_children++;
     }
 
-  /* invisible seperator button */
+  /* invisible separator button */
   ac = 0;
   XtSetArg (al[ac], XmNmappedWhenManaged, FALSE); ac++;
   children [n_children] = XmCreateLabel (row, "separator_button",
@@ -1256,7 +1260,7 @@ make_dialog (char* name, Widget parent, Boolean pop_up_p,
       XtSetArg(al[ac], XmNrightOffset, 13);			ac++;
       value = XmCreateScrolledList (form, "list", al, ac);
 
-      /* this is the easiest way I found to have the dble click in the
+      /* this is the easiest way I found to have the double click in the
 	 list activate the default button */
       XtAddCallback (value, XmNdefaultActionCallback, activate_button, button);
     }
@@ -1688,7 +1692,7 @@ xm_create_text_field (widget_instance *instance)
   Widget text = 0;
   widget_value* val = instance->info->val;
 
-  XtSetArg (al [ac], XmNsensitive, val->enabled && val->call_data);		ac++;
+  XtSetArg (al [ac], XmNsensitive, val->enabled);		ac++;
   XtSetArg (al [ac], XmNalignment, XmALIGNMENT_BEGINNING);	ac++;
   XtSetArg (al [ac], XmNuserData, val->call_data);		ac++;
   XtSetArg (al [ac], XmNmappedWhenManaged, FALSE);	ac++;