X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.h;h=a578501fc2518a52f9b9d9bbf3c3a425173ac91a;hb=2fd2474505b93912de67053897566bf325dd5b08;hp=f939d9ff1522ecb35679526d5b1ad24f78b7e59c;hpb=0fe886a656b0ee57b4d542b7c16b3c56288b6fc6;p=pspp diff --git a/src/ui/gui/psppire-data-window.h b/src/ui/gui/psppire-data-window.h index f939d9ff15..a578501fc2 100644 --- 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 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; @@ -61,11 +67,11 @@ struct _PsppireDataWindow GtkBuilder *builder; GtkUIManager *ui_manager; - PsppireVarStore *var_store; + 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; @@ -95,7 +101,8 @@ 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); +void open_data_window (PsppireWindow *victim, const char *file_name, + const char *encoding, gpointer hint); G_END_DECLS