X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.h;h=7da33113331af1451ba7b34a2be3e52d262d0eb1;hb=c4bc3574d974d3aaf4d291097c995a31515a308a;hp=490c8d56d37e8c533e0e7696252953b86118bd86;hpb=23f6228ab54f9a810940bd41d21531f56ef7567e;p=pspp

diff --git a/src/ui/gui/psppire-data-editor.h b/src/ui/gui/psppire-data-editor.h
index 490c8d56d3..7da3311333 100644
--- a/src/ui/gui/psppire-data-editor.h
+++ b/src/ui/gui/psppire-data-editor.h
@@ -51,6 +51,8 @@ struct _PsppireDataEditor
 {
   GtkNotebook parent;
 
+  gboolean dispose_has_run;
+
   /* <private> */
   PsppireDataStore *data_store;
   PsppireDict *dict;
@@ -62,30 +64,13 @@ struct _PsppireDataEditor
   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;      /* 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. */
-  GtkWidget *old_vbox_widget;
+  gboolean split;              /* True if the sheets are in split view. */
+  gboolean use_value_labels;   /* True if labels instead of data are shown. */
 };
 
 struct _PsppireDataEditorClass
@@ -98,7 +83,7 @@ GType          psppire_data_editor_get_type        (void);
 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 );
+void           psppire_data_editor_split_window    (PsppireDataEditor *, gboolean);
 
 void psppire_data_editor_goto_variable               (PsppireDataEditor *, gint dict_index);
 void psppire_data_editor_data_delete_variables       (PsppireDataEditor *de);
@@ -110,8 +95,7 @@ struct _PsppireDataSheet *psppire_data_editor_get_active_data_sheet (PsppireData
 
 enum {PSPPIRE_DATA_EDITOR_DATA_VIEW = 0, PSPPIRE_DATA_EDITOR_VARIABLE_VIEW};
 
-
-
+void psppire_data_editor_paste (PsppireDataEditor *de);
 
 G_END_DECLS