mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 13:11:13 +00:00
Display any "g_unicode_isgraph()" char literally, not just latin1.
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com> * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Display any "g_unicode_isgraph()" char literally, not just latin1. (#65679)
This commit is contained in:
parent
d1be9aea8d
commit
1e9f8b7c0f
10
ChangeLog
10
ChangeLog
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -1,8 +1,14 @@
|
|||||||
|
Tue Feb 26 18:38:17 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
|
* gtk/gtkaccellabel.c (gtk_accel_label_refetch):
|
||||||
|
Display any "g_unicode_isgraph()" char literally,
|
||||||
|
not just latin1. (#65679)
|
||||||
|
|
||||||
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
Tue Feb 26 18:01:10 2002 Owen Taylor <otaylor@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
* gtk/gtkwidget.c (gtk_widget_grab_focus): Don't
|
||||||
to focus insensitive widgets. (#68203)
|
focus insensitive widgets. (#68203)
|
||||||
|
|
||||||
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
* gtk/gtkentry.c (gtk_entry_state_changed): Clear any
|
||||||
current selection if we become insensitive. (#68203)
|
current selection if we become insensitive. (#68203)
|
||||||
|
|
||||||
|
@ -492,6 +492,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
|
|||||||
{
|
{
|
||||||
GString *gstring;
|
GString *gstring;
|
||||||
gboolean seen_mod = FALSE;
|
gboolean seen_mod = FALSE;
|
||||||
|
gunichar ch;
|
||||||
|
|
||||||
gstring = g_string_new (accel_label->accel_string);
|
gstring = g_string_new (accel_label->accel_string);
|
||||||
g_string_append (gstring, gstring->len ? class->accel_seperator : " ");
|
g_string_append (gstring, gstring->len ? class->accel_seperator : " ");
|
||||||
@ -517,12 +518,12 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
|
|||||||
}
|
}
|
||||||
if (seen_mod)
|
if (seen_mod)
|
||||||
g_string_append (gstring, class->mod_separator);
|
g_string_append (gstring, class->mod_separator);
|
||||||
if (key->accel_key < 0x80 ||
|
|
||||||
(key->accel_key > 0x80 &&
|
ch = gdk_keyval_to_unicode (key->accel_key);
|
||||||
key->accel_key <= 0xff &&
|
if (ch && (g_unichar_isgraph (ch) || ch == ' ') &&
|
||||||
class->latin1_to_char))
|
(ch < 0x80 || class->latin1_to_char))
|
||||||
{
|
{
|
||||||
switch (key->accel_key)
|
switch (ch)
|
||||||
{
|
{
|
||||||
case ' ':
|
case ' ':
|
||||||
g_string_append (gstring, "Space");
|
g_string_append (gstring, "Space");
|
||||||
@ -531,7 +532,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
|
|||||||
g_string_append (gstring, "Backslash");
|
g_string_append (gstring, "Backslash");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_string_append_unichar (gstring, g_unichar_toupper (key->accel_key));
|
g_string_append_unichar (gstring, g_unichar_toupper (ch));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user