X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.h;h=161b374597998e861e1421f7f290bd3ec256e5d3;hb=8642df034e82487ec7ff476fbfbacbd5b65eb88a;hp=1f97cbc7e0e4814f5fd7d40ca897b78e352c64ee;hpb=ca5f6bb9df6d4019d777b52da0419d917d4dfc52;p=pspp

diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h
index 1f97cbc7e0..161b374597 100644
--- 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, 2016  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,15 +20,12 @@
 
 #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>
+#include <gtksourceview/gtksource.h>
+
+#include "language/lexer/lexer.h"
 
 G_BEGIN_DECLS
 
@@ -53,21 +50,30 @@ struct _PsppireSyntaxWindow
   /* <private> */
 
   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;
+  enum segmenter_mode syntax_mode;
 
   GtkPrintSettings *print_settings;
   GtkSourcePrintCompositor *compositor;
-  GtkAction *undo_menuitem;
-  GtkAction *redo_menuitem;
+  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;
+  GSimpleAction *edit_find;
+
+  GtkEntryBuffer *search_text_buffer;
+
+  gulong ps_handler;
+  gulong sel_handler;
+
+  gboolean dispose_has_run;
 };
 
 struct _PsppireSyntaxWindowClass
@@ -79,11 +85,10 @@ struct _PsppireSyntaxWindowClass
 };
 
 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_new_syntax_window (const char *file_name);
-
+GtkWindow * open_syntax_window (const char *file_name, const char *encoding);
 
 G_END_DECLS