From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 27 Jun 2015 14:22:25 +0000 (+0200)
Subject: OutputWindow: Convert deprecated widgets to non-deprecated ones
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c32883c1675879e1d59f703033af702e214040;p=pspp

OutputWindow: Convert deprecated widgets to non-deprecated ones
---

diff --git a/src/ui/gui/output-window.ui b/src/ui/gui/output-window.ui
index a9b7702e5b..f89deb10c4 100644
--- a/src/ui/gui/output-window.ui
+++ b/src/ui/gui/output-window.ui
@@ -82,8 +82,9 @@
     <property name="default_width">600</property>
     <property name="default_height">400</property>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
+	<property name="orientation">GTK_ORIENTATION_VERTICAL</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
           <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
@@ -96,8 +97,9 @@
           </packing>
         </child>
         <child>
-          <object class="GtkHPaned" id="hpaned1">
+          <object class="GtkPaned" id="paned1">
             <property name="visible">True</property>
+	    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
             <property name="can_focus">True</property>
             <property name="position">112</property>
             <property name="position_set">True</property>
@@ -142,6 +144,7 @@
           </object>
           <packing>
             <property name="position">1</property>
+	    <property name="expand">True</property>
           </packing>
         </child>
       </object>
diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 66ea9d3927..8e343d2359 100644
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -478,7 +478,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
 
   xml = builder_new ("output-window.ui");
 
-  gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window));
+  gtk_widget_reparent (get_widget_assert (xml, "box1"), GTK_WIDGET (window));
 
   window->dispose_has_run = FALSE;