Commit d2b64a0b authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor
Browse files

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.)
parent 845d3701
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment