refactoring

[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 c4a6d2c07a5d56c8816460107efc668ce65a6bb4..161b374597998e861e1421f7f290bd3ec256e5d3 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, 2011  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
@@ -23,10 +23,9 @@
 #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
 
@@ -51,22 +50,25 @@ 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;
@@ -86,7 +88,7 @@ GType      psppire_syntax_window_get_type        (void);
 GtkWidget* psppire_syntax_window_new             (const char *encoding);
 
 void create_syntax_window (void);
-void open_syntax_window (const char *file_name, const char *encoding);
+GtkWindow * open_syntax_window (const char *file_name, const char *encoding);
 
 G_END_DECLS