Sanitize move/resize code, removing various bad, non-functional hacks.

Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
	* gtk/gtkcombo.c (gtk_combo_popup_list): Sanitize
	move/resize code, removing various bad, non-functional
	hacks. (Fixes #65048, reported by Damon Chaplin.)

diff --git a/ChangeLog b/ChangeLog
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0582dbac3d213a51d6589aaff302a26bd32f36f4..4cda4af4f0e1fa8c98c783543ff8b8cc2f0150f2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Nov 30 16:37:01 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <otaylor@redhat.com>
 
        * gdk/gdkpango.c: Patch from Hidetoshi Tajima to fix 
@@ -38,7 +44,6 @@ Thu Nov 29 21:35:56 2001  Kristian Rietveld  <kristian@planet.nl>
        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  <otaylor@redhat.com>
 
        * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Remove 

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 589912bb337066af0f52b8f81034e4d16683a1a4..dcc711b728f484caf2f0fcbcdddabafc9f86d8ca 100644 (file)
--- 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);