Merge psppire-axis and psppire-axis-impl

[pspp-builds.git] / 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 b896c54578aa97c9685ae7fd126804419097d66f..b5b3f3600a5d490f17bcf606788ec4bee5e738cb 100644 (file)
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -22,6 +22,7 @@
 #include <glib-object.h>
 #include <gtk/gtknotebook.h>
 
+#include <ui/gui/sheet/psppire-axis.h>
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
 
@@ -46,10 +47,23 @@ struct _PsppireDataEditor
   gboolean dispose_has_run;
   GtkWidget *cell_ref_entry;
   GtkWidget *datum_entry;
-  GtkWidget *data_sheet;
   GtkWidget *var_sheet;
   PsppireDataStore *data_store;
   PsppireVarStore *var_store;
+
+  GtkWidget *sheet_bin[4];
+  GtkWidget *data_sheet[4];
+
+  GtkWidget *data_vbox;
+
+  GtkWidget *paned;
+  gboolean split;
+
+  PsppireAxis *vaxis[2];
+
+  /* There's only one horizontal axis, since the
+     column widths are parameters of the variables */
+  PsppireAxis *haxis;
 };
 
 
@@ -73,7 +87,7 @@ void           psppire_data_editor_insert_case     (PsppireDataEditor *);
 void           psppire_data_editor_delete_cases    (PsppireDataEditor *);
 void           psppire_data_editor_set_font        (PsppireDataEditor *, PangoFontDescription *);
 void           psppire_data_editor_delete_cases    (PsppireDataEditor *);
-
+void           psppire_data_editor_split_window    (PsppireDataEditor *, gboolean );
 
 
 G_END_DECLS