From 1e9f8b7c0f2a4197641f59d4bd152feb03d0cad3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 26 Feb 2002 23:46:23 +0000 Subject: [PATCH] Display any "g_unicode_isgraph()" char literally, not just latin1. Tue Feb 26 18:38:17 2002 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Display any "g_unicode_isgraph()" char literally, not just latin1. (#65679) --- ChangeLog | 10 ++++++++-- ChangeLog.pre-2-0 | 10 ++++++++-- ChangeLog.pre-2-10 | 10 ++++++++-- ChangeLog.pre-2-2 | 10 ++++++++-- ChangeLog.pre-2-4 | 10 ++++++++-- ChangeLog.pre-2-6 | 10 ++++++++-- ChangeLog.pre-2-8 | 10 ++++++++-- gtk/gtkaccellabel.c | 13 +++++++------ 8 files changed, 63 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6d21017cd7..8dd432278c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,14 @@ +Tue Feb 26 18:38:17 2002 Owen Taylor + + * 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 * 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 current selection if we become insensitive. (#68203) 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; } }