[goffice] Compilation: handle some easy deprecations.

[Morten Welinder <mortenw src gnome org>]

commit 2525a6c12bb00f64b03f47242ee0d56b19e06173
Author: Morten Welinder <terra gnome org>
Date:   Sun Dec 28 17:35:39 2014 -0500

    Compilation: handle some easy deprecations.

 goffice/canvas/goc-widget.c      |    2 +-
 goffice/graph/gog-child-button.c |    4 ----
 goffice/gtk/go-optionmenu.c      |    4 ----
 goffice/gtk/go-selector.c        |    4 ----
 4 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/goffice/canvas/goc-widget.c b/goffice/canvas/goc-widget.c
index 904d638..ff6ca75 100644
--- a/goffice/canvas/goc-widget.c
+++ b/goffice/canvas/goc-widget.c
@@ -233,7 +233,7 @@ goc_offscreen_box_realize (GtkWidget *widget)
                attributes.width = child_area.width;
                attributes.height = child_area.height;
        }
-       offscreen_box->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
+       offscreen_box->offscreen_window = gdk_window_new (gdk_screen_get_root_window (gtk_widget_get_screen 
(widget)),
                                                          &attributes, attributes_mask);
        gdk_window_set_user_data (offscreen_box->offscreen_window, widget);
        if (offscreen_box->child)
diff --git a/goffice/graph/gog-child-button.c b/goffice/graph/gog-child-button.c
index ac6d328..49852b1 100644
--- a/goffice/graph/gog-child-button.c
+++ b/goffice/graph/gog-child-button.c
@@ -70,14 +70,10 @@ gog_child_button_init (GogChildButton *child_button)
        child_button->menu = NULL;
        child_button->button_handling_in_progress = FALSE;
 
-       gtk_widget_push_composite_child ();
-
        child_button->toggle_button = gtk_toggle_button_new_with_label ("gtk-add");
        gtk_button_set_use_stock (GTK_BUTTON (child_button->toggle_button), TRUE);
        gtk_widget_show (child_button->toggle_button);
 
-       gtk_widget_pop_composite_child ();
-
        gtk_box_pack_start (GTK_BOX (child_button), child_button->toggle_button, TRUE, TRUE, 0);
 
        g_signal_connect (G_OBJECT (child_button->toggle_button), "toggled",
diff --git a/goffice/gtk/go-optionmenu.c b/goffice/gtk/go-optionmenu.c
index c40c469..5ef75bf 100644
--- a/goffice/gtk/go-optionmenu.c
+++ b/goffice/gtk/go-optionmenu.c
@@ -488,8 +488,6 @@ go_option_menu_init (GOOptionMenu *option_menu)
        GtkBox *box;
        GtkWidget *arrow, *sep;
 
-       gtk_widget_push_composite_child ();
-
        gtk_widget_set_can_focus (GTK_WIDGET (option_menu), TRUE);
        gtk_button_set_focus_on_click (GTK_BUTTON (option_menu), TRUE);
        gtk_widget_set_can_default (GTK_WIDGET (option_menu), FALSE);
@@ -512,8 +510,6 @@ go_option_menu_init (GOOptionMenu *option_menu)
        gtk_box_pack_end (box, sep, FALSE, FALSE, 0);
 
        gtk_container_add (GTK_CONTAINER (option_menu), GTK_WIDGET (box));
-
-       gtk_widget_pop_composite_child ();
 }
 
 GSF_CLASS (GOOptionMenu, go_option_menu,
diff --git a/goffice/gtk/go-selector.c b/goffice/gtk/go-selector.c
index 21e24fb..825279e 100644
--- a/goffice/gtk/go-selector.c
+++ b/goffice/gtk/go-selector.c
@@ -90,8 +90,6 @@ go_selector_init (GOSelector *selector)
        priv->selected_index = 0;
        priv->selected_is_auto = FALSE;
 
-       gtk_widget_push_composite_child ();
-
        priv->button = gtk_toggle_button_new ();
        g_signal_connect (priv->button, "toggled",
                          G_CALLBACK (go_selector_button_toggled), selector);
@@ -121,8 +119,6 @@ go_selector_init (GOSelector *selector)
                            priv->arrow, FALSE, FALSE, 0);
        gtk_widget_show (priv->arrow);
 
-       gtk_widget_pop_composite_child ();
-
        gtk_box_pack_start (GTK_BOX (selector), priv->button, TRUE, TRUE, 0);
 
        priv->dnd_length = 0;