diff options
Diffstat (limited to 'widgets/misc/gal-combo-box.c')
| -rw-r--r-- | widgets/misc/gal-combo-box.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c index 49fddfb92f..ba010bc2d2 100644 --- a/widgets/misc/gal-combo-box.c +++ b/widgets/misc/gal-combo-box.c @@ -416,8 +416,7 @@ gal_combo_box_init (GalComboBox *combo_box) */ combo_box->priv->toplevel = gtk_window_new (GTK_WINDOW_POPUP); - gtk_widget_ref (combo_box->priv->toplevel); - gtk_object_sink (GTK_OBJECT (combo_box->priv->toplevel)); + g_object_ref_sink (combo_box->priv->toplevel); gtk_window_set_policy (GTK_WINDOW (combo_box->priv->toplevel), FALSE, TRUE, FALSE); @@ -509,8 +508,7 @@ gtk_combo_popup_tear_off (GalComboBox *combo, gboolean set_position) /* FIXME: made this a toplevel, not a dialog ! */ tearoff = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_ref (tearoff); - gtk_object_sink (GTK_OBJECT (tearoff)); + g_object_ref_sink (tearoff); combo->priv->tearoff_window = tearoff; gtk_widget_set_app_paintable (tearoff, TRUE); g_signal_connect (tearoff, "key_press_event", @@ -612,7 +610,7 @@ gtk_combo_tearoff_bg_copy (GalComboBox *combo) 0, 0, 0, 0, -1, -1); g_object_unref (gc); - gtk_widget_set_usize (combo->priv->tearoff_window, + gtk_widget_set_size_request (combo->priv->tearoff_window, widget->allocation.width, widget->allocation.height); @@ -637,11 +635,10 @@ gtk_combo_popup_reparent (GtkWidget *popup, GtkWidget *new_parent, gboolean unrealize) { - GtkObject *object = GTK_OBJECT (popup); - gboolean was_floating = GTK_OBJECT_FLOATING (object); + GObject *object = G_OBJECT (popup); + gboolean was_floating = g_object_is_floating (object); - g_object_ref (object); - gtk_object_sink (object); + g_object_ref_sink (object); if (unrealize) { g_object_ref (object); @@ -651,10 +648,10 @@ gtk_combo_popup_reparent (GtkWidget *popup, } else gtk_widget_reparent (GTK_WIDGET (popup), new_parent); - gtk_widget_set_usize (new_parent, -1, -1); + gtk_widget_set_size_request (new_parent, -1, -1); if (was_floating) - GTK_OBJECT_SET_FLAGS (object, GTK_FLOATING); + g_object_force_floating (object); else g_object_unref (object); } |