X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.h;h=bfa8cbf3c086fb6da06d85a12bcfffa219b6db7d;hb=109eccf01c32b5784f464de2d424fd7a9905123f;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..bfa8cbf3c0 100644
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -32,9 +32,7 @@
 #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"
 
 G_BEGIN_DECLS
 
@@ -55,24 +53,39 @@ 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 popup menu */
+  GtkWidget *data_sheet_cases_row_popup;
+  GtkWidget *data_clear_cases_menu_item;
+
+
+  GtkWidget *data_sheet_cases_column_popup;
+  GtkWidget *data_clear_variables_menu_item;
+  GtkWidget *data_sort_ascending_menu_item;
+  GtkWidget *data_sort_descending_menu_item;
+
+  /* Var sheet popup menu */
+  GtkWidget *var_sheet_row_popup;
+  GtkWidget *var_clear_variables_menu_item;
+
+  
   /* 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 +95,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 );
@@ -91,8 +104,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