Remove deprecated objects GtkAction and GtkUIManager

[pspp] / src / ui / gui / psppire-syntax-window.h

diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h
index 08f5a7c5b2190246c9691a43b191b25b8f81484a..3c6cd1e1194fe83652392c4c9074e7cc20dae14a 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.h
+++ b/src/ui/gui/psppire-syntax-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010  Free Software Foundation
+   Copyright (C) 2008, 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
@@ -20,17 +20,20 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
-#include "psppire-window.h"
 #include <gtk/gtk.h>
+#include "psppire-window.h"
+
+#include <gtksourceview/gtksourcelanguage.h>
+#include <gtksourceview/gtksourcelanguagemanager.h>
+#include <gtksourceview/gtksourcebuffer.h>
+#include <gtksourceview/gtksourceprintcompositor.h>
 
 G_BEGIN_DECLS
 
 #define PSPPIRE_SYNTAX_WINDOW_TYPE            (psppire_syntax_window_get_type ())
 #define PSPPIRE_SYNTAX_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntaxWindow))
 #define PSPPIRE_SYNTAX_WINDOW_CLASS(class)    (G_TYPE_CHECK_CLASS_CAST ((class), \
-    PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntax_WindowClass))
+    PSPPIRE_SYNTAX_WINDOW_TYPE, PsppireSyntaxWindowClass))
 #define PSPPIRE_IS_SYNTAX_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
     PSPPIRE_SYNTAX_WINDOW_TYPE))
 #define PSPPIRE_IS_SYNTAX_WINDOW_CLASS(class) (G_TYPE_CHECK_CLASS_TYPE ((class), \
@@ -47,17 +50,23 @@ struct _PsppireSyntaxWindow
 
   /* <private> */
 
-  GtkTextBuffer *buffer;  /* The buffer which contains the text */
+  GtkSourceBuffer *buffer;  /* The buffer which contains the text */
   struct lexer *lexer;    /* Lexer to parse syntax */
+  gchar *encoding;              /* File's encoding. */
   GtkWidget *sb;
   guint text_context;
 
+  GtkPrintSettings *print_settings;
+  GtkSourcePrintCompositor *compositor;
+  GSimpleAction *undo_menuitem;
+  GSimpleAction *redo_menuitem;
+
   gchar *cliptext;
 
-  GtkAction *edit_cut;
-  GtkAction *edit_copy;
-  GtkAction *edit_delete;
-  GtkAction *edit_paste;
+  GSimpleAction *edit_cut;
+  GSimpleAction *edit_copy;
+  GSimpleAction *edit_delete;
+  GSimpleAction *edit_paste;
 
   gulong ps_handler;
   gulong sel_handler;
@@ -69,13 +78,15 @@ struct _PsppireSyntaxWindowClass
 {
   PsppireWindowClass parent_class;
 
+
+  GtkSourceLanguage *lan ;
 };
 
 GType      psppire_syntax_window_get_type        (void);
-GtkWidget* psppire_syntax_window_new             (void);
+GtkWidget* psppire_syntax_window_new             (const char *encoding);
 
 void create_syntax_window (void);
-void open_syntax_window (const char *file_name);
+void open_syntax_window (const char *file_name, const char *encoding);
 
 G_END_DECLS