projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(mark_coding_system): Mark initial-charset-g0 and -g1 of CODESYS_BIG5
[chise/xemacs-chise.git-]
/
lwlib
/
lwlib-Xm.c
diff --git
a/lwlib/lwlib-Xm.c
b/lwlib/lwlib-Xm.c
index
410af34
..
2903ede
100644
(file)
--- 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)
{
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
#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);
{
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);
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);
val_string =
XmStringCreateLtoR (value_name, XmSTRING_DEFAULT_CHARSET);
-
+
built_string =
XmStringConcat (name_string, val_string);
built_string =
XmStringConcat (name_string, val_string);
-
+
XtFree (value_name);
}
}
XtFree (value_name);
}
}
@@
-927,7
+931,7
@@
xm_update_one_value (widget_instance* instance, Widget widget,
val->edited = True;
}
}
val->edited = True;
}
}
- else if (class == xmListWidgetClass
+ else if (class == xmListWidgetClass
#if defined (LWLIB_WIDGETS_MOTIF) && XmVERSION > 1
|| class == xmComboBoxWidgetClass
#endif
#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++;
}
n_children++;
}
- /* invisible seperator button */
+ /* invisible separator button */
ac = 0;
XtSetArg (al[ac], XmNmappedWhenManaged, FALSE); ac++;
children [n_children] = XmCreateLabel (row, "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);
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);
}
list activate the default button */
XtAddCallback (value, XmNdefaultActionCallback, activate_button, button);
}
@@
-1782,7
+1786,7
@@
xm_create_combo_box (widget_instance *instance)
\f
/* Table of functions to create widgets */
\f
/* Table of functions to create widgets */
-widget_creation_entry
+const widget_creation_entry
xm_creation_table [] =
{
#ifdef LWLIB_MENUBARS_MOTIF
xm_creation_table [] =
{
#ifdef LWLIB_MENUBARS_MOTIF