diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-01-15 04:08:31 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-01-15 04:08:31 +0000 |
| commit | 9963bd083b2eb4bc31ea3e9094167ac1605e1d2c (patch) | |
| tree | 87dd90dc7237216deda31d2a4fd381937abd98fd /gtk/gtkcombobox.c | |
| parent | 8700ff7bcf6737c95874016ced7e29d4ac5724eb (diff) | |
| download | gtk+-9963bd083b2eb4bc31ea3e9094167ac1605e1d2c.tar.gz | |
Fix a crash with combo boxes in RESIZE_IMMEDIATE containers. (#326806,
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.
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 66fe8022fb..7a96131d72 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -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), |