projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FACTOR: Fix a crash when bad input was presented
[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 df16ed3ba62fd650552c8897c01f1b3d48f925f5..cb125028c94181b4c94ac229d60d42a90f82d4ad 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.
/* 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
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,10
@@
#include <glib.h>
#include <glib-object.h>
#include <glib.h>
#include <glib-object.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktextbuffer.h>
-#include "psppire-window.h"
#include <gtk/gtk.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>
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-54,20
+49,21
@@
struct _PsppireSyntaxWindow
GtkSourceBuffer *buffer; /* The buffer which contains the text */
struct lexer *lexer; /* Lexer to parse syntax */
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;
GtkWidget *sb;
guint text_context;
GtkPrintSettings *print_settings;
GtkSourcePrintCompositor *compositor;
- G
tk
Action *undo_menuitem;
- G
tk
Action *redo_menuitem;
+ G
Simple
Action *undo_menuitem;
+ G
Simple
Action *redo_menuitem;
gchar *cliptext;
gchar *cliptext;
- G
tk
Action *edit_cut;
- G
tk
Action *edit_copy;
- G
tk
Action *edit_delete;
- G
tk
Action *edit_paste;
+ G
Simple
Action *edit_cut;
+ G
Simple
Action *edit_copy;
+ G
Simple
Action *edit_delete;
+ G
Simple
Action *edit_paste;
gulong ps_handler;
gulong sel_handler;
gulong ps_handler;
gulong sel_handler;
@@
-84,11
+80,10
@@
struct _PsppireSyntaxWindowClass
};
GType psppire_syntax_window_get_type (void);
};
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 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
G_END_DECLS