Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-data-editor.h

diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h
index 35666600decca02e6f3b06e471ff79422f974a3e..d31b32c380f7031853fc7cebdfac69976c890d67 100644 (file)
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -33,7 +33,6 @@
 #include <gtk/gtk.h>
 
 #include "psppire-data-store.h"
-#include "ui/gui/pspp-sheet-view.h"
 
 G_BEGIN_DECLS
 
@@ -61,17 +60,16 @@ struct _PsppireDataEditor
 
   /* Variable sheet tab. */
   GtkWidget *var_sheet;
+  GtkWidget *data_sheet;
 
   /* Data sheet tab. */
   GtkWidget *vbox;             /* Top-level widget in tab. */
   GtkWidget *cell_ref_label;   /* GtkLabel that shows selected case and var. */
-  GtkWidget *datum_entry;      /* GtkComboBoxEntry for editing current cell. */
-  GtkWidget *datasheet_vbox_widget; /* ->vbox child that holds data sheets. */
-  GtkWidget *data_sheets[4];   /* Normally one data sheet; four, if split. */
+  GtkWidget *datum_entry;      /* PsppireValueEntry for editing current cell. */
+
   gboolean split;              /* True if data sheets are split. */
 
   /* UI manager for whichever var or data sheet is currently in use. */
-  GtkUIManager *ui_manager;
   GtkWidget *old_vbox_widget;
 };
 
@@ -91,8 +89,6 @@ void           psppire_data_editor_goto_variable   (PsppireDataEditor *, gint di
 
 struct _PsppireDataSheet *psppire_data_editor_get_active_data_sheet (PsppireDataEditor *);
 
-GtkUIManager *psppire_data_editor_get_ui_manager (PsppireDataEditor *);
-
 enum {PSPPIRE_DATA_EDITOR_DATA_VIEW = 0, PSPPIRE_DATA_EDITOR_VARIABLE_VIEW};
 
 G_END_DECLS