dropped support for gtk < 2.20

[geeqie.git] / src / pan-view.c

diff --git a/src/pan-view.c b/src/pan-view.c
index aab0dc2..c6facb9 100644 (file)
--- a/src/pan-view.c
+++ b/src/pan-view.c
@@ -1214,15 +1214,9 @@ static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, g
        fd = pan_menu_click_fd(pw);
        
        imd_widget = gtk_container_get_focus_child(GTK_CONTAINER(pw->imd->widget));
-#if GTK_CHECK_VERSION(2,20,0)
        focused = (pw->fs || imd_widget && gtk_widget_has_focus(imd_widget));
        on_entry = (gtk_widget_has_focus(pw->path_entry) ||
                    gtk_widget_has_focus(pw->search_entry));
-#else
-       focused = (pw->fs || imd_widget && GTK_WIDGET_HAS_FOCUS(imd_widget));
-       on_entry = (GTK_WIDGET_HAS_FOCUS(pw->path_entry) ||
-                   GTK_WIDGET_HAS_FOCUS(pw->search_entry));
-#endif
 
        if (focused)
                {
@@ -1975,11 +1969,7 @@ static void pan_search_toggle_cb(GtkWidget *button, gpointer data)
        PanWindow *pw = data;
        gboolean visible;
 
-#if GTK_CHECK_VERSION(2,20,0)
        visible = gtk_widget_get_visible(pw->search_box);
-#else
-       visible = GTK_WIDGET_VISIBLE(pw->search_box);
-#endif
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return;
 
        if (visible)
@@ -2001,11 +1991,7 @@ static void pan_search_toggle_visible(PanWindow *pw, gboolean enable)
 
        if (enable)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(pw->search_box))
-#else
-               if (GTK_WIDGET_VISIBLE(pw->search_box))
-#endif
                        {
                        gtk_widget_grab_focus(pw->search_entry);
                        }
@@ -2016,17 +2002,9 @@ static void pan_search_toggle_visible(PanWindow *pw, gboolean enable)
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(pw->search_entry))
-#else
-               if (GTK_WIDGET_VISIBLE(pw->search_entry))
-#endif
                        {
-#if GTK_CHECK_VERSION(2,20,0)
                        if (gtk_widget_has_focus(pw->search_entry))
-#else
-                       if (GTK_WIDGET_HAS_FOCUS(pw->search_entry))
-#endif
                                {
                                gtk_widget_grab_focus(GTK_WIDGET(pw->imd->widget));
                                }