Pass the corrent arguments to pspp_sheet_view_column_cell_render

[pspp] / src / ui / gui / psppire-window.c

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 23c512d792dbb6a58769549f5408719093adc8a0..dcc44a8d5520a1c9bf3669034fc80caeb6c6fc0a 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -310,8 +310,10 @@ psppire_window_base_init (PsppireWindowClass *class)
 static void
 menu_toggled (GtkCheckMenuItem *mi, gpointer data)
 {
+#if GTK3_TRANSITION
   /* Prohibit changes to the state */
   mi->active = !mi->active;
+#endif
 }
 
 
@@ -355,9 +357,11 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
 
   gtk_menu_shell_append (window->menu, item);
 
+#if GTK3_TRANSITION
   /* Set the state without emitting a signal */
   GTK_CHECK_MENU_ITEM (item)->active =
    (psppire_window_register_lookup (psppire_window_register_new (), key) == window);
+#endif
 
   g_hash_table_insert (window->menuitem_table, key, item);
 }
@@ -660,7 +664,7 @@ psppire_window_save_as (PsppireWindow *w)
 static void delete_recent (const char *file_name);
 
 gboolean
-psppire_window_load (PsppireWindow *w, const gchar *file)
+psppire_window_load (PsppireWindow *w, const gchar *file, gpointer hint)
 {
   gboolean ok;
   PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
@@ -671,7 +675,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file)
 
   g_return_val_if_fail (i->load, FALSE);
 
-  ok = i->load (w, file);
+  ok = i->load (w, file, hint);
 
   if ( ok )
     {
@@ -804,7 +808,7 @@ psppire_window_open (PsppireWindow *de)
           gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
 
        if (any_reader_may_open (sysname))
-          open_data_window (de, name);
+          open_data_window (de, name, NULL);
        else
          open_syntax_window (name, encoding);