X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-output-window.h;h=7ceaee7f06728d733381de1eaf35755bcec2bf1e;hb=f0d3b9e75a250c98c48c982aa0b5377868b5bfad;hp=d11eca618d84c9c18c86e5dc7bd184b6f9771a75;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp

diff --git a/src/ui/gui/psppire-output-window.h b/src/ui/gui/psppire-output-window.h
index d11eca618d..7ceaee7f06 100644
--- 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.
-   Copyright (C) 2008  Free Software Foundation
+   Copyright (C) 2008, 2009, 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
@@ -21,20 +21,14 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 #include "psppire-window.h"
 #include "psppire.h"
-#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 ())
@@ -56,9 +50,23 @@ struct _PsppireOutputWindow
   PsppireWindow parent;
 
   /* <private> */
-  GtkTextBuffer *buffer;  /* The buffer which contains the text */
-  GtkWidget *textview ;
-  FILE *fp;               /* The file it's viewing */
+  struct psppire_output_driver *driver;
+  GtkLayout *output;
+  int max_width;
+  int y;
+
+  GtkTreeView *overview;
+  GtkTreeIter cur_command;
+  bool in_command;
+
+  struct output_item **items;
+  size_t n_items, allocated_items;
+
+  /* Variables pertaining to printing */
+  GtkPrintSettings *print_settings;
+  struct xr_driver *print_xrd;
+  int print_item;
+  int print_n_pages;
 };
 
 struct _PsppireOutputWindowClass
@@ -70,9 +78,7 @@ struct _PsppireOutputWindowClass
 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