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 621a9e24f90ef07a0182dca4e1b3b3ed4bfdf9f4..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  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,17 +21,10 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
-#include "psppire-window.h"
 #include <gtk/gtk.h>
-
-extern int viewer_length;
-extern int viewer_width ;
-
-
-#define OUTPUT_FILE_NAME "psppire.txt"
-
+#include "psppire-window.h"
+#include "psppire.h"
+#include "libpspp/string-map.h"
 
 
 G_BEGIN_DECLS
@@ -55,9 +48,10 @@ 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;
+  struct psppire_output_view *view;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireOutputWindowClass
@@ -69,9 +63,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