From 3c1fc24f617b2a8c4338613e2b9ec355280c93ea Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 Oct 2005 04:40:04 +0000 Subject: [PATCH] Don't eat Ctrl-PageUp/PageDown. (#318670, Christian Neumair) 2005-10-27 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat Ctrl-PageUp/PageDown. (#318670, Christian Neumair) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gtk/gtkcombobox.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3e464b948b..b011f7adc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-10-27 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e464b948b..b011f7adc1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-10-27 Matthias Clasen + * 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) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 46deea972e..656aa02788 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -3495,6 +3495,9 @@ gtk_combo_box_key_press (GtkWidget *widget, return TRUE; } + if (state != 0) + return FALSE; + switch (event->keyval) { case GDK_Down: