X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-editor.h;h=02959150ca57a4bbac6bd142ea125d1a36a0854a;hb=06033ee856ec75ed98dc7f4b5bf2c61876650fdf;hp=35666600decca02e6f3b06e471ff79422f974a3e;hpb=9d1bfb34842de4a129140622ee3d800297c0e69d;p=pspp

diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h
index 35666600de..02959150ca 100644
--- 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,18 +60,34 @@ struct _PsppireDataEditor
 
   /* 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;
+
+  GtkCellRenderer *value_label_renderer;
 };
 
 struct _PsppireDataEditorClass
@@ -87,14 +102,18 @@ void           psppire_data_editor_show_grid       (PsppireDataEditor *, gboolea
 void           psppire_data_editor_set_font        (PsppireDataEditor *, PangoFontDescription *);
 void           psppire_data_editor_split_window    (PsppireDataEditor *, gboolean );
 
-void           psppire_data_editor_goto_variable   (PsppireDataEditor *, gint dict_index);
+void psppire_data_editor_goto_variable               (PsppireDataEditor *, gint dict_index);
+void psppire_data_editor_data_delete_variables       (PsppireDataEditor *de);
+void psppire_data_editor_var_delete_variables        (PsppireDataEditor *de);
+void psppire_data_editor_insert_new_case_at_posn     (PsppireDataEditor *de, gint posn);
+void psppire_data_editor_insert_new_variable_at_posn (PsppireDataEditor *de, gint posn);
 
 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};
 
+void psppire_data_editor_paste (PsppireDataEditor *de);
+
 G_END_DECLS
 
 #endif /* __PSPPIRE_DATA_EDITOR_H__ */