projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Eliminate dataset-related global variables.
[pspp-builds.git]
/
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 1b6deab12ab1f30c5ccada6a8e135d31ce349372..0100254386adf3dd9085a0d9954555bbfe51fa76 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.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008 Free Software Foundation
+ Copyright (C) 2008
, 2010
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
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
@@
-21,11
+21,13
@@
#include <glib.h>
#include <glib-object.h>
#include <glib.h>
#include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include "psppire-window.h"
-#include "psppire-data-editor.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
+#include "ui/gui/psppire-window.h"
+#include "ui/gui/psppire-data-editor.h"
+
+struct dataset;
+
G_BEGIN_DECLS
#define PSPPIRE_DATA_WINDOW_TYPE (psppire_data_window_get_type ())
G_BEGIN_DECLS
#define PSPPIRE_DATA_WINDOW_TYPE (psppire_data_window_get_type ())
@@
-50,6
+52,9
@@
struct _PsppireDataWindow
PsppireDataEditor *data_editor;
GtkBuilder *builder;
PsppireDataEditor *data_editor;
GtkBuilder *builder;
+ PsppireVarStore *var_store;
+ struct dataset *dataset;
+ PsppireDataStore *data_store;
GtkAction *invoke_goto_dialog;
GtkAction *invoke_goto_dialog;
@@
-59,11
+64,6
@@
struct _PsppireDataWindow
GtkAction *delete_cases;
GtkAction *delete_cases;
- GtkMenu *data_sheet_variable_popup_menu;
- GtkMenu *data_sheet_cases_popup_menu;
- GtkMenu *var_sheet_variable_popup_menu;
-
-
gboolean save_as_portable;
};
gboolean save_as_portable;
};
@@
-73,7
+73,8
@@
struct _PsppireDataWindowClass
};
GType psppire_data_window_get_type (void);
};
GType psppire_data_window_get_type (void);
-GtkWidget* psppire_data_window_new (void);
+GtkWidget* psppire_data_window_new (struct dataset *);
+PsppireDataWindow *psppire_default_data_window (void);
G_END_DECLS
G_END_DECLS