diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkcombobox.c | 3 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2005-10-27 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat + Ctrl-PageUp/PageDown. (#318670, Christian Neumair) + * demos/gtk-demo/clipboard.c (paste_received): Only set the text if it is not NULL. (#319930, Thomas Klausner) @@ -29,7 +32,7 @@ glib-mkenums. (#318582, Damien Carbery) * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify - docs. (#317682, Christian - Manny Calavera - Neumair) + docs. (#317682, Christian Neumair) * gdk/x11/gdkdnd-x11.c: Remove an extra const which doesn't seem to affect the placement of the data in the readonly diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b3e234c60c..090bd349bf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-10-27 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat + Ctrl-PageUp/PageDown. (#318670, Christian Neumair) + * demos/gtk-demo/clipboard.c (paste_received): Only set the text if it is not NULL. (#319930, Thomas Klausner) @@ -29,7 +32,7 @@ glib-mkenums. (#318582, Damien Carbery) * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify - docs. (#317682, Christian - Manny Calavera - Neumair) + docs. (#317682, Christian Neumair) * gdk/x11/gdkdnd-x11.c: Remove an extra const which doesn't seem to affect the placement of the data in the readonly diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index f6a6a22771..d6ae05a40b 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -3492,6 +3492,9 @@ gtk_combo_box_key_press (GtkWidget *widget, return TRUE; } + if (state != 0) + return FALSE; + switch (event->keyval) { case GDK_Down: |