#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-static void psppire_syntax_window_base_finalize (PsppireSyntaxWindowClass *, gpointer);
-static void psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class);
static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class);
static void psppire_syntax_window_init (PsppireSyntaxWindow *syntax_editor);
};
}
-GType
-psppire_syntax_window_get_type (void)
-{
- static GType psppire_syntax_window_type = 0;
-
- if (!psppire_syntax_window_type)
- {
- static const GTypeInfo psppire_syntax_window_info =
- {
- sizeof (PsppireSyntaxWindowClass),
- (GBaseInitFunc) psppire_syntax_window_base_init,
- (GBaseFinalizeFunc) psppire_syntax_window_base_finalize,
- (GClassInitFunc)psppire_syntax_window_class_init,
- (GClassFinalizeFunc) NULL,
- NULL,
- sizeof (PsppireSyntaxWindow),
- 0,
- (GInstanceInitFunc) psppire_syntax_window_init,
- };
-
- static const GInterfaceInfo window_interface_info =
- {
- (GInterfaceInitFunc) psppire_syntax_window_iface_init,
- NULL,
- NULL
- };
-
- psppire_syntax_window_type =
- g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireSyntaxWindow",
- &psppire_syntax_window_info, 0);
-
- g_type_add_interface_static (psppire_syntax_window_type,
- PSPPIRE_TYPE_WINDOW_MODEL,
- &window_interface_info);
- }
-
- return psppire_syntax_window_type;
-}
+G_DEFINE_TYPE_WITH_CODE (PsppireSyntaxWindow, psppire_syntax_window, PSPPIRE_TYPE_WINDOW,
+ G_IMPLEMENT_INTERFACE (PSPPIRE_TYPE_WINDOW_MODEL, psppire_syntax_window_iface_init))
static GObjectClass *parent_class ;
static void
psppire_syntax_window_dispose (GObject *obj)
{
- PsppireSyntaxWindow *sw = (PsppireSyntaxWindow *)obj;
+ PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (obj);
GtkClipboard *clip_selection;
GtkClipboard *clip_primary;
{
GParamSpec *encoding_spec;
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ gobject_class->finalize = psppire_syntax_window_finalize;
GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
}
-static void
-psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (class);
- object_class->finalize = psppire_syntax_window_finalize;
-}
-
-
-
-static void
-psppire_syntax_window_base_finalize (PsppireSyntaxWindowClass *class,
- gpointer class_data)
-{
-}
-
-
static void
editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
GtkTextIter stop)
sw->cliptext = NULL;
}
+static gchar tn1[] = "UTF8_STRING";
+static gchar tn2[] = "STRING";
+static gchar tn3[] = "TEXT";
+static gchar tn4[] = "COMPOUND_TEXT";
+static gchar tn5[] = "text/plain;charset=utf-8";
+static gchar tn6[] = "text/plain";
static const GtkTargetEntry targets[] = {
- { "UTF8_STRING", 0, SELECT_FMT_TEXT },
- { "STRING", 0, SELECT_FMT_TEXT },
- { "TEXT", 0, SELECT_FMT_TEXT },
- { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
- { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
- { "text/plain", 0, SELECT_FMT_TEXT },
+ { tn1, 0, SELECT_FMT_TEXT },
+ { tn2, 0, SELECT_FMT_TEXT },
+ { tn3, 0, SELECT_FMT_TEXT },
+ { tn4, 0, SELECT_FMT_TEXT },
+ { tn5, 0, SELECT_FMT_TEXT },
+ { tn6, 0, SELECT_FMT_TEXT }
};
-
/*
Store a clip containing the currently selected text.
Returns true iff something was set.
window->ps_handler = g_signal_connect (clip_selection, "owner-change",
G_CALLBACK (set_paste_sensitivity), window);
- connect_help (xml);
-
gtk_container_add (GTK_CONTAINER (window), box);
g_object_ref (sw);
G_CALLBACK (psppire_window_save),
window);
- const gchar *accels[2] = { "<Ctrl>S", NULL};
+ const gchar *accels[2] = { "<Primary>S", NULL};
gtk_application_set_accels_for_action (app,
"win.save",
accels);
window);
- const gchar *accels[2] = { "<Shift><Ctrl>S", NULL};
+ const gchar *accels[2] = { "<Shift><Primary>S", NULL};
gtk_application_set_accels_for_action (app,
"win.save_as",
accels);
g_action_map_add_action (G_ACTION_MAP (window), G_ACTION (run_current_line));
GtkApplication *app = GTK_APPLICATION (g_application_get_default ());
- const gchar *accels[2] = { "<Ctrl>R", NULL};
+ const gchar *accels[2] = { "<Primary>R", NULL};
gtk_application_set_accels_for_action (app,
"win.run-current-line",
accels);
/*
Loads the buffer from the file called FILENAME
*/
-gboolean
+static gboolean
syntax_load (PsppireWindow *window, const gchar *filename,
const gchar *encoding, gpointer not_used)
{