Remove deprecated objects GtkAction and GtkUIManager

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

diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h
index d63f49aed751a70c4ae40da32109d01d28b1207a..ee4d8e0cab767d54509194e7401d06471371e5a9 100644 (file)
--- a/src/ui/gui/psppire-data-window.h
+++ b/src/ui/gui/psppire-data-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012, 2013, 2014, 2016  Free Software Foundation
 
    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
@@ -52,6 +52,12 @@ typedef struct _PsppireDataWindow       PsppireDataWindow;
 typedef struct _PsppireDataWindowClass  PsppireDataWindowClass;
 
 
+enum PsppireDataWindowFormat {
+  PSPPIRE_DATA_WINDOW_SAV,
+  PSPPIRE_DATA_WINDOW_ZSAV,
+  PSPPIRE_DATA_WINDOW_POR
+};
+
 struct _PsppireDataWindow
 {
   PsppireWindow parent;
@@ -59,20 +65,38 @@ struct _PsppireDataWindow
   /* <private> */
   PsppireDataEditor *data_editor;
   GtkBuilder *builder;
-  GtkUIManager *ui_manager;
 
   PsppireDict *dict;
   struct dataset *dataset;
   PsppireDataStore *data_store;
 
-  gboolean save_as_portable;
+  enum PsppireDataWindowFormat format;
 
   struct ll ll;                 /* In global 'all_data_windows' list. */
   unsigned long int lazy_serial;
   unsigned int dataset_seqno;
 
-  GtkUIManager *uim;
-  guint merge_id;
+  GtkToolItem *ti_value_labels_button;
+
+  GtkToolItem *ti_jump_to_variable;
+  GtkToolItem *ti_insert_variable;
+  GtkToolItem *ti_jump_to_case;
+  GtkToolItem *ti_insert_case;
+  GtkToolItem *ti_find;
+
+  GtkWidget *mi_go_to_case;
+  GtkWidget *mi_insert_case;
+  GtkWidget *mi_find;
+  GtkWidget *mi_find_separator;
+
+
+  GtkWidget *mi_edit_separator ;
+  GtkWidget *mi_cut;
+  GtkWidget *mi_copy;
+  GtkWidget *mi_paste;
+  GtkWidget *mi_clear_variables;
+  GtkWidget *mi_clear_cases;
+  GtkWidget *mi_insert_var;
 };
 
 struct _PsppireDataWindowClass
@@ -94,8 +118,9 @@ PsppireDataWindow *psppire_data_window_for_dataset (struct dataset *);
 PsppireDataWindow *psppire_data_window_for_data_store (PsppireDataStore *);
 
 bool psppire_data_window_is_empty (PsppireDataWindow *);
-void create_data_window (void);
-void open_data_window (PsppireWindow *victim, const char *file_name);
+GtkWindow * create_data_window (void);
+void open_data_window (PsppireWindow *victim, const char *file_name,
+                       const char *encoding, gpointer hint);
 
 G_END_DECLS