Merge remote branch 'origin/master' into import-gui

[pspp] / 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 54447b1d5b417f22397632988435ae37f1e714bc..74d3bb97be3cf9884933a5d0985600b949fdc8c3 100644 (file)
--- a/src/ui/gui/psppire-output-window.h
+++ b/src/ui/gui/psppire-output-window.h
@@ -24,9 +24,7 @@
 #include <gtk/gtk.h>
 #include "psppire-window.h"
 #include "psppire.h"
-
-extern int viewer_length;
-extern int viewer_width ;
+#include "libpspp/string-map.h"
 
 
 G_BEGIN_DECLS
@@ -55,6 +53,7 @@ struct _PsppireOutputWindow
   int max_width;
   int y;
 
+  struct string_map render_opts;
   GtkTreeView *overview;
   GtkTreeIter cur_command;
   bool in_command;
@@ -68,6 +67,8 @@ struct _PsppireOutputWindow
   int print_item;
   int print_n_pages;
   gboolean paginated;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireOutputWindowClass