Data Editor: Remove the GtkHandleBox

This widget is deprecated, and I never saw the point of it anyway.

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 6fded8e99186b40b42f3a746c558c25cce52aee0..6eb37356e14558c24ccdfea767656edeadf3a4fa 100644 (file)
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -641,15 +641,10 @@
   <object class="GtkMenuBar" constructor="uimanager1" id="menubar">
     <property name="visible">True</property>
   </object>
-  <object class="GtkHandleBox" id="handlebox1">
-    <property name="visible">True</property>
-    <child>
       <object class="GtkToolbar" constructor="uimanager1" id="toolbar">
         <property name="visible">True</property>
         <property name="toolbar-style">GTK_TOOLBAR_ICONS</property>
       </object>
-    </child>
-  </object>
 
   <object class="GtkHBox" id="status-bar">
     <property name="visible">True</property>

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 54cd2c35d2595baad2c4eddfac639df2cb023114..6464097194c72fbc95c7b8f6fac4412e80c13fcf 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -944,7 +944,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   psppire_data_store_set_reader (de->data_store, NULL);
 
   menubar = get_widget_assert (de->builder, "menubar");
-  hb = get_widget_assert (de->builder, "handlebox1");
+  hb = get_widget_assert (de->builder, "toolbar");
   sb = get_widget_assert (de->builder, "status-bar");
 
   de->uim = NULL;