X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.h;h=e75ccd781989a49c92280d59ab2140f94ba78f31;hb=aa6f8e301fab021ba2fea720a162e506612ba29f;hp=ea08f0131782a2f59b93ae61793c5b4c4e31f480;hpb=0fe886a656b0ee57b4d542b7c16b3c56288b6fc6;p=pspp

diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h
index ea08f01317..e75ccd7819 100644
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -32,7 +32,6 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "psppire-var-store.h"
 #include "psppire-data-store.h"
 #include "ui/gui/pspp-sheet-view.h"
 
@@ -55,24 +54,25 @@ struct _PsppireDataEditor
 
   /* <private> */
   PsppireDataStore *data_store;
-  PsppireVarStore *var_store;
+  PsppireDict *dict;
 
   /* Font to use in var sheet and data sheet(s), NULL to use system default. */
   struct _PangoFontDescription *font;
 
   /* 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;
 };
 
 struct _PsppireDataEditorClass
@@ -82,7 +82,7 @@ struct _PsppireDataEditorClass
 
 
 GType          psppire_data_editor_get_type        (void);
-GtkWidget*     psppire_data_editor_new             (PsppireVarStore *, PsppireDataStore *);
+GtkWidget*     psppire_data_editor_new             (PsppireDict *, PsppireDataStore *);
 void           psppire_data_editor_show_grid       (PsppireDataEditor *, gboolean);
 void           psppire_data_editor_set_font        (PsppireDataEditor *, PangoFontDescription *);
 void           psppire_data_editor_split_window    (PsppireDataEditor *, gboolean );