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,
+ (GBaseInitFunc) (void (*)(void)) psppire_syntax_window_base_init,
+ (GBaseFinalizeFunc) (void (*)(void)) psppire_syntax_window_base_finalize,
+ (GClassInitFunc) (void (*)(void)) psppire_syntax_window_class_init,
(GClassFinalizeFunc) NULL,
NULL,
sizeof (PsppireSyntaxWindow),
0,
- (GInstanceInitFunc) psppire_syntax_window_init,
+ (GInstanceInitFunc) (void (*)(void)) psppire_syntax_window_init,
+ NULL /* value_table */
};
static const GInterfaceInfo window_interface_info =
{
- (GInterfaceInitFunc) psppire_syntax_window_iface_init,
+ (GInterfaceInitFunc) (void (*)(void)) psppire_syntax_window_iface_init,
NULL,
NULL
};
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);