Disable the remaining Gtk+2 features.

These do not seem easy to work around.  But none of them are
essential.  Postponing them till after the transition.

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index b87584de71b44b75cf71abca784aa835754beae1..ab7ccfd72563739e14dc36fbebbb4a19f3793f6f 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -189,11 +189,13 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     }
 
 
+#if GTK3_TRANSITION
   if (gtk_assistant_get_page_type (assistant, page)
       == GTK_ASSISTANT_PAGE_CONFIRM)
     gtk_widget_grab_focus (assistant->apply);
   else
     gtk_widget_grab_focus (assistant->forward);
+#endif
 }
 
 /* Called when the Cancel button in the assistant is clicked. */

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 475bfa4959fc556e99b3d8a7207ec77c0ac08b58..89a96a8286be101f0d02ca0027166ad2f11a7b75 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -355,8 +355,10 @@ static void     pspp_sheet_view_search_position_func      (PsppSheetView      *t
 static void     pspp_sheet_view_search_disable_popdown    (GtkEntry         *entry,
                                                         GtkMenu          *menu,
                                                         gpointer          data);
+#if GTK3_TRANSITION
 static void     pspp_sheet_view_search_preedit_changed    (GtkIMContext     *im_context,
                                                         PsppSheetView      *tree_view);
+#endif
 static void     pspp_sheet_view_search_activate           (GtkEntry         *entry,
                                                         PsppSheetView      *tree_view);
 static gboolean pspp_sheet_view_real_search_enable_popdown(gpointer          data);
@@ -8667,10 +8669,12 @@ pspp_sheet_view_ensure_interactive_directory (PsppSheetView *tree_view)
                    "activate", G_CALLBACK (pspp_sheet_view_search_activate),
                    tree_view);
 
+#if GTK3_TRANSITION
   g_signal_connect (GTK_ENTRY (tree_view->priv->search_entry)->im_context,
                    "preedit-changed",
                    G_CALLBACK (pspp_sheet_view_search_preedit_changed),
                    tree_view);
+#endif
 
   gtk_container_add (GTK_CONTAINER (vbox),
                     tree_view->priv->search_entry);
@@ -11809,6 +11813,7 @@ pspp_sheet_view_search_disable_popdown (GtkEntry *entry,
                    G_CALLBACK (pspp_sheet_view_search_enable_popdown), data);
 }
 
+#if GTK3_TRANSITION
 /* Because we're visible but offscreen, we just set a flag in the preedit
  * callback.
  */
@@ -11827,6 +11832,7 @@ pspp_sheet_view_search_preedit_changed (GtkIMContext *im_context,
     }
 
 }
+#endif
 
 static void
 pspp_sheet_view_search_activate (GtkEntry    *entry,

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 0a4021f71841585bd02544a07d5103ad32c0a9ee..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);
 }