From d2b64a0b838d71e01a2cb3eec1e32f1ea1f787b5 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 30 Nov 2001 21:51:46 +0000 Subject: [PATCH] Sanitize move/resize code, removing various bad, non-functional hacks. Fri Nov 30 16:37:01 2001 Owen Taylor * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize move/resize code, removing various bad, non-functional hacks. (Fixes #65048, reported by Damon Chaplin.) --- ChangeLog | 7 ++++++- ChangeLog.pre-2-0 | 7 ++++++- ChangeLog.pre-2-10 | 7 ++++++- ChangeLog.pre-2-2 | 7 ++++++- ChangeLog.pre-2-4 | 7 ++++++- ChangeLog.pre-2-6 | 7 ++++++- ChangeLog.pre-2-8 | 7 ++++++- gtk/gtkcombo.c | 6 ++---- 8 files changed, 44 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0582dbac3..4cda4af4f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Nov 30 16:37:01 2001 Owen Taylor + + * gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize + move/resize code, removing various bad, non-functional + hacks. (Fixes #65048, reported by Damon Chaplin.) + Fri Nov 30 16:12:21 2001 Owen Taylor * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix @@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001 Kristian Rietveld assertion here that we were at the end iterator was not correct; change code to move us to the end iterator. bug #65731 ->>>>>>> 1.2646 Wed Nov 28 20:05:44 2001 Owen Taylor * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 589912bb3..dcc711b72 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -486,10 +486,8 @@ gtk_combo_popup_list (GtkCombo * combo) gtk_widget_hide (GTK_SCROLLED_WINDOW (combo->popup)->vscrollbar); } - gtk_widget_set_uposition (combo->popwin, x, y); + gtk_window_move (GTK_WINDOW (combo->popwin), x, y); gtk_widget_set_usize (combo->popwin, width, height); - gtk_widget_realize (combo->popwin); - gdk_window_resize (combo->popwin->window, width, height); gtk_widget_show (combo->popwin); gtk_widget_grab_focus (combo->popwin); @@ -784,7 +782,7 @@ gtk_combo_init (GtkCombo * combo) combo->popwin = gtk_window_new (GTK_WINDOW_POPUP); gtk_widget_ref (combo->popwin); - gtk_window_set_policy (GTK_WINDOW (combo->popwin), 1, 1, 0); + gtk_window_set_resizable (GTK_WINDOW (combo->popwin), FALSE); gtk_signal_connect (GTK_OBJECT (combo->popwin), "key_press_event", GTK_SIGNAL_FUNC (gtk_combo_window_key_press), combo); -- 2.43.2