psppire-output-window: Factor out output view as psppire-output-view.

[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 c242e732881f4076e179da6a618b1b04352f463b..06938d3b935d37d2b479396c294c63bc687a76af 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.
-   Copyright (C) 2008, 2009  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2014  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
@@ -53,22 +49,9 @@ struct _PsppireOutputWindow
 
   /* <private> */
   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 psppire_output_view *view;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireOutputWindowClass