projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into output
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-output-window.h
diff --git
a/src/ui/gui/psppire-output-window.h
b/src/ui/gui/psppire-output-window.h
index 621a9e24f90ef07a0182dca4e1b3b3ed4bfdf9f4..606a950475fc6ecc1d4833fb7eea46e9faf8ccdf 100644
(file)
--- a/
src/ui/gui/psppire-output-window.h
+++ b/
src/ui/gui/psppire-output-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
, 2009
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
@@
-24,16
+24,13
@@
#include <gtk/gtkaction.h>
#include <gtk/gtktextbuffer.h>
#include "psppire-window.h"
#include <gtk/gtkaction.h>
#include <gtk/gtktextbuffer.h>
#include "psppire-window.h"
+#include "psppire.h"
#include <gtk/gtk.h>
extern int viewer_length;
extern int viewer_width ;
#include <gtk/gtk.h>
extern int viewer_length;
extern int viewer_width ;
-#define OUTPUT_FILE_NAME "psppire.txt"
-
-
-
G_BEGIN_DECLS
#define PSPPIRE_OUTPUT_WINDOW_TYPE (psppire_output_window_get_type ())
G_BEGIN_DECLS
#define PSPPIRE_OUTPUT_WINDOW_TYPE (psppire_output_window_get_type ())
@@
-55,9
+52,13
@@
struct _PsppireOutputWindow
PsppireWindow parent;
/* <private> */
PsppireWindow parent;
/* <private> */
- GtkTextBuffer *buffer; /* The buffer which contains the text */
- GtkWidget *textview ;
- FILE *fp; /* The file it's viewing */
+ GtkLayout *output;
+ int max_width;
+ int y;
+
+ GtkTreeView *overview;
+ int last_table_num;
+ GtkTreeIter last_top_level;
};
struct _PsppireOutputWindowClass
};
struct _PsppireOutputWindowClass
@@
-69,9
+70,7
@@
struct _PsppireOutputWindowClass
GType psppire_output_window_get_type (void);
GtkWidget* psppire_output_window_new (void);
GType psppire_output_window_get_type (void);
GtkWidget* psppire_output_window_new (void);
-
-void psppire_output_window_reload (void);
-
+void psppire_output_window_setup (void);
G_END_DECLS
G_END_DECLS