diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-02-26 23:46:23 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-02-26 23:46:23 +0000 |
| commit | 1e9f8b7c0f2a4197641f59d4bd152feb03d0cad3 (patch) | |
| tree | 12a8d3d98eaa50e53c629c4911dc4c4a600c73a4 /gtk | |
| parent | d1be9aea8d336e2f4b647234a82b9b1b0ab78b53 (diff) | |
| download | gtk+-1e9f8b7c0f2a4197641f59d4bd152feb03d0cad3.tar.gz | |
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)
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkaccellabel.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 98c6a99610..c5d1b87167 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -492,6 +492,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) { GString *gstring; gboolean seen_mod = FALSE; + gunichar ch; gstring = g_string_new (accel_label->accel_string); g_string_append (gstring, gstring->len ? class->accel_seperator : " "); @@ -517,12 +518,12 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) } if (seen_mod) g_string_append (gstring, class->mod_separator); - if (key->accel_key < 0x80 || - (key->accel_key > 0x80 && - key->accel_key <= 0xff && - class->latin1_to_char)) + + ch = gdk_keyval_to_unicode (key->accel_key); + if (ch && (g_unichar_isgraph (ch) || ch == ' ') && + (ch < 0x80 || class->latin1_to_char)) { - switch (key->accel_key) + switch (ch) { case ' ': g_string_append (gstring, "Space"); @@ -531,7 +532,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label) g_string_append (gstring, "Backslash"); break; default: - g_string_append_unichar (gstring, g_unichar_toupper (key->accel_key)); + g_string_append_unichar (gstring, g_unichar_toupper (ch)); break; } } |