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=4fc019991c8cdb264b764620f20918d1aa060e74;hb=7a48928f76e0f4599be8f65b1b3bafd03d73a628;hp=606a950475fc6ecc1d4833fb7eea46e9faf8ccdf;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp

diff --git a/src/ui/gui/psppire-output-window.h b/src/ui/gui/psppire-output-window.h
index 606a950475..4fc019991c 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, 2009  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011  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,14 +21,10 @@
 
 #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 ;
+#include "libpspp/string-map.h"
 
 
 G_BEGIN_DECLS
@@ -52,13 +48,25 @@ struct _PsppireOutputWindow
   PsppireWindow parent;
 
   /* <private> */
+  struct psppire_output_driver *driver;
   GtkLayout *output;
   int max_width;
   int y;
 
+  struct string_map render_opts;
   GtkTreeView *overview;
-  int last_table_num;
-  GtkTreeIter last_top_level;
+  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;
+  gboolean paginated;
 };
 
 struct _PsppireOutputWindowClass