Merge remote-tracking branch 'origin/master' into sheet

[pspp] / src / ui / gui / psppire-data-sheet.h

diff --git a/src/ui/gui/psppire-data-sheet.h b/src/ui/gui/psppire-data-sheet.h
index a94bad7c77c88872deec64152066603dc2f89b5c..8e73b9e381695f7f2b4ddd463078ddc3845cb6a3 100644 (file)
--- a/src/ui/gui/psppire-data-sheet.h
+++ b/src/ui/gui/psppire-data-sheet.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012, 2013 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
@@ -17,6 +17,8 @@
 #ifndef PSPPIRE_DATA_SHEET_H
 #define PSPPIRE_DATA_SHEET_H 1
 
+#error "Do not include this file"
+
 /* PsppireDataSheet is a PsppSheetView that displays the data in a dataset,
    with one column per variable and one row per case.
 
@@ -48,16 +50,24 @@ struct _PsppireDataSheet
   gboolean may_create_vars;
   gboolean may_delete_vars;
 
+  gboolean owns_primary_selection;
+
   guint scroll_to_bottom_signal;
   guint scroll_to_right_signal;
 
-  PsppSheetViewColumn *new_variable_column;
+  GtkClipboard *clip;
+  guint on_owner_change_signal;
 
-  GtkBuilder *builder;
+  PsppSheetViewColumn *new_variable_column;
 
   GtkWidget *container;
-  GtkUIManager *uim;
   gboolean dispose_has_run;
+
+  GtkWidget *column_popup_menu;
+  GtkWidget *row_popup_menu;
+  
+  GtkWidget *pu_sort_up;
+  GtkWidget *pu_sort_down;
 };
 
 struct _PsppireDataSheetClass 
@@ -86,14 +96,22 @@ void psppire_data_sheet_set_may_create_vars (PsppireDataSheet *, gboolean);
 gboolean psppire_data_sheet_get_may_delete_vars (PsppireDataSheet *);
 void psppire_data_sheet_set_may_delete_vars (PsppireDataSheet *, gboolean);
 
-void psppire_data_sheet_show_variable (PsppireDataSheet *, gint dict_index);
+void psppire_data_sheet_goto_variable (PsppireDataSheet *, gint dict_index);
 struct variable *psppire_data_sheet_get_current_variable (const PsppireDataSheet *);
 
 void psppire_data_sheet_goto_case (PsppireDataSheet *, gint case_index);
 gint psppire_data_sheet_get_selected_case (const PsppireDataSheet *);
 gint psppire_data_sheet_get_current_case (const PsppireDataSheet *);
 
-GtkUIManager *psppire_data_sheet_get_ui_manager (PsppireDataSheet *);
+void psppire_data_sheet_insert_case (PsppireDataSheet *data_sheet);
+void psppire_data_sheet_insert_variable (PsppireDataSheet *data_sheet);
+
+void psppire_data_sheet_edit_cut (PsppireDataSheet *data_sheet);
+void psppire_data_sheet_edit_copy (PsppireDataSheet *data_sheet);
+void psppire_data_sheet_edit_paste (PsppireDataSheet *data_sheet);
+
+void psppire_data_sheet_edit_clear_cases (PsppireDataSheet *data_sheet);
+void psppire_data_sheet_edit_clear_variables (PsppireDataSheet *data_sheet);
 
 G_END_DECLS