From 674c327f377d851383fcd613f82c1bb61f14a978 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 13 Mar 2009 08:19:25 +0900
Subject: [PATCH] Fixed problems getting accelerator keys to work in data
 editor

---
 src/ui/gui/data-editor.glade     | 37 ++++----------------------------
 src/ui/gui/psppire-data-window.c |  9 --------
 2 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/src/ui/gui/data-editor.glade b/src/ui/gui/data-editor.glade
index 4d507221..a922366b 100644
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -2,14 +2,6 @@
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
 <!--*- mode: xml -*-->
 <glade-interface>
-  <widget class="GtkWindow" id="data_editor">
-    <property name="title">Psppire Data Editor</property>
-    <property name="default_width">975</property>
-    <property name="default_height">480</property>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
           <widget class="GtkMenuBar" id="menubar">
             <property name="visible">True</property>
             <child>
@@ -666,12 +658,8 @@
               </widget>
             </child>
           </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
+
+
           <widget class="GtkHandleBox" id="handlebox1">
             <property name="visible">True</property>
             <property name="shadow_type">GTK_SHADOW_OUT</property>
@@ -906,16 +894,8 @@
               </widget>
             </child>
           </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
+
+
           <widget class="GtkHBox" id="status-bar">
             <property name="visible">True</property>
             <property name="spacing">6</property>
@@ -1067,13 +1047,4 @@
               </packing>
             </child>
           </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
 </glade-interface>
diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index c735d05b..ccfa9ad1 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1050,15 +1050,6 @@ psppire_data_window_init (PsppireDataWindow *de)
 
   connect_help (de->builder);
 
-  g_object_ref (menubar);
-  gtk_widget_unparent (menubar);
-
-  g_object_ref (hb);
-  gtk_widget_unparent (hb);
-
-  g_object_ref (sb);
-  gtk_widget_unparent (sb);
-
   gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0);
-- 
2.30.2