AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a crash with combo boxes in RESIZE_IMMEDIATE containers. (#326806,

Browse Source 
2006-01-14  Matthias Clasen  <mclasen@redhat.com>

	Fix a crash with combo boxes in RESIZE_IMMEDIATE
	containers.  (#326806, Sebastian Bacher)

	* gtk/gtkcombobox.c (gtk_combo_box_size_allocate)
	(gtk_combo_box_size_request): Don't call
	gtk_combo_box_check_appearance() from here, as that
	can lead to recursion.
	(gtk_combo_box_init): Instead, call it here.
This commit is contained in:
Matthias Clasen 2006-01-15 04:08:31 +00:00 committed by Matthias Clasen
parent 8700ff7bcf
commit 9963bd083b
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2006-01-14 Matthias Clasen <mclasen@redhat.com>
Fix a crash with combo boxes in RESIZE_IMMEDIATE
containers. (#326806, Sebastian Bacher)
* gtk/gtkcombobox.c (gtk_combo_box_size_allocate)
(gtk_combo_box_size_request): Don't call
gtk_combo_box_check_appearance() from here, as that
can lead to recursion.
(gtk_combo_box_init): Instead, call it here.
2006-01-14 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_iter_children): fix

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
2006-01-14 Matthias Clasen <mclasen@redhat.com>
Fix a crash with combo boxes in RESIZE_IMMEDIATE
containers. (#326806, Sebastian Bacher)
* gtk/gtkcombobox.c (gtk_combo_box_size_allocate)
(gtk_combo_box_size_request): Don't call
gtk_combo_box_check_appearance() from here, as that
can lead to recursion.
(gtk_combo_box_init): Instead, call it here.
2006-01-14 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_iter_children): fix

8
gtk/gtkcombobox.c
View File

@ -781,6 +781,8 @@ gtk_combo_box_init (GtkComboBox *combo_box)
combo_box->priv->editing_canceled = FALSE;
combo_box->priv->auto_scroll = FALSE;
combo_box->priv->focus_on_click = TRUE;
gtk_combo_box_check_appearance (combo_box);
}
static void
@ -1841,9 +1843,7 @@ gtk_combo_box_size_request (GtkWidget *widget,
GtkRequisition bin_req;
GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
gtk_combo_box_check_appearance (combo_box);
/* common */
gtk_widget_size_request (GTK_BIN (widget)->child, &bin_req);
gtk_combo_box_remeasure (combo_box);
@ -1936,8 +1936,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
GtkRequisition req;
gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
gtk_combo_box_check_appearance (combo_box);
widget->allocation = *allocation;
gtk_widget_style_get (GTK_WIDGET (widget),