From 778ecd02e7e979d74f990e68ec39dbbcf2c74967 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 4 Jul 2015 19:28:33 +0200
Subject: [PATCH] Avoid gtk_widget_reparent which is deprecated

---
 src/ui/gui/output-window.ui        | 7 -------
 src/ui/gui/psppire-output-window.c | 7 +++----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/ui/gui/output-window.ui b/src/ui/gui/output-window.ui
index f89deb10c4..76822d17d8 100644
--- a/src/ui/gui/output-window.ui
+++ b/src/ui/gui/output-window.ui
@@ -77,11 +77,6 @@
   </object>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkWindow" id="output-viewer-window">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="default_width">600</property>
-    <property name="default_height">400</property>
-    <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
 	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
@@ -148,6 +143,4 @@
           </packing>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 75e3362da8..14df40dbeb 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -474,11 +474,10 @@ psppire_output_window_export (PsppireOutputWindow *window)
 static void
 psppire_output_window_init (PsppireOutputWindow *window)
 {
-  GtkBuilder *xml;
+  GtkBuilder *xml = builder_new ("output-window.ui");
 
-  xml = builder_new ("output-window.ui");
-
-  gtk_widget_reparent (get_widget_assert (xml, "box1"), GTK_WIDGET (window));
+  GtkWidget *box = get_widget_assert (xml, "box1");
+  gtk_container_add (GTK_CONTAINER (window), box);
 
   window->dispose_has_run = FALSE;
 
-- 
2.30.2