gui: Eliminate dataset-related global variables.

[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 9b81c223fdcce1e3c28f7a161efb7e0162bef873..f6f55d7ca5c56c9381dc8dd0b332248eb09738a2 100644 (file)
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
-#include <lib/gtksheet/psppire-axis-impl.h>
+#include <ui/gui/sheet/psppire-axis.h>
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
 
@@ -48,6 +48,7 @@ struct _PsppireDataEditor
   GtkWidget *cell_ref_entry;
   GtkWidget *datum_entry;
   GtkWidget *var_sheet;
+  struct _PsppireDataWindow *data_window;
   PsppireDataStore *data_store;
   PsppireVarStore *var_store;
 
@@ -59,11 +60,11 @@ struct _PsppireDataEditor
   GtkWidget *paned;
   gboolean split;
 
-  PsppireAxisImpl *vaxis[2];
+  PsppireAxis *vaxis[2];
 
   /* There's only one horizontal axis, since the
      column widths are parameters of the variables */
-  PsppireAxisImpl *haxis;
+  PsppireAxis *haxis;
 };
 
 
@@ -74,7 +75,7 @@ struct _PsppireDataEditorClass
 
 
 GType          psppire_data_editor_get_type        (void);
-GtkWidget*     psppire_data_editor_new             (PsppireVarStore *, PsppireDataStore *);
+GtkWidget*     psppire_data_editor_new             (struct _PsppireDataWindow *, PsppireVarStore *, PsppireDataStore *);
 void           psppire_data_editor_clip_copy       (PsppireDataEditor *);
 void           psppire_data_editor_clip_paste      (PsppireDataEditor *);
 void           psppire_data_editor_clip_cut        (PsppireDataEditor *);