projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[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..c4a6d2c07a5d56c8816460107efc668ce65a6bb4 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
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,17
+20,20
@@
#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>
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), \
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), \
#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,11
+50,17
@@
struct _PsppireSyntaxWindow
/* <private> */
/* <private> */
- Gtk
Text
Buffer *buffer; /* The buffer which contains the text */
+ Gtk
Source
Buffer *buffer; /* The buffer which contains the text */
struct lexer *lexer; /* Lexer to parse syntax */
struct lexer *lexer; /* Lexer to parse syntax */
+ gchar *encoding; /* File's encoding. */
GtkWidget *sb;
guint text_context;
GtkWidget *sb;
guint text_context;
+ GtkPrintSettings *print_settings;
+ GtkSourcePrintCompositor *compositor;
+ GtkAction *undo_menuitem;
+ GtkAction *redo_menuitem;
+
gchar *cliptext;
GtkAction *edit_cut;
gchar *cliptext;
GtkAction *edit_cut;
@@
-69,13
+78,15
@@
struct _PsppireSyntaxWindowClass
{
PsppireWindowClass parent_class;
{
PsppireWindowClass parent_class;
+
+ GtkSourceLanguage *lan ;
};
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_syntax_window (const char *file_name);
+void open_syntax_window (const char *file_name
, const char *encoding
);
G_END_DECLS
G_END_DECLS