dropped support for gtk < 2.20

[geeqie.git] / src / layout.c

diff --git a/src/layout.c b/src/layout.c
index 3487eb0..c175c12 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -332,11 +332,7 @@ static void layout_sort_menu_ascend_cb(GtkWidget *widget, gpointer data)
 static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data)
 {
        /* destroy the menu */
-#if GTK_CHECK_VERSION(2,12,0)
        g_object_unref(widget);
-#else
-       gtk_widget_unref(GTK_WIDGET(widget));
-#endif
 }
 
 static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data)
@@ -1164,11 +1160,7 @@ gboolean layout_geometry_get_tools(LayoutWindow *lw, gint *x, gint *y, gint *w,
        GtkAllocation allocation;
        if (!layout_valid(&lw)) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!lw->tools || !gtk_widget_get_visible(lw->tools))
-#else
-       if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools))
-#endif
                {
                /* use the stored values (sort of breaks success return value) */
 
@@ -1207,11 +1199,7 @@ static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
 
        if (hide)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(lw->tools))
-#else
-               if (GTK_WIDGET_VISIBLE(lw->tools))
-#endif
                        {
                        layout_tools_geometry_sync(lw);
                        gtk_widget_hide(lw->tools);
@@ -1219,11 +1207,7 @@ static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (!gtk_widget_get_visible(lw->tools))
-#else
-               if (!GTK_WIDGET_VISIBLE(lw->tools))
-#endif
                        {
                        gtk_widget_show(lw->tools);
                        if (lw->vf) vf_refresh(lw->vf);
@@ -1749,19 +1733,11 @@ void layout_toolbar_toggle(LayoutWindow *lw)
 
        if (lw->options.toolbar_hidden)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
-#else
-               if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]);
-#endif
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
-#else
-               if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]);
-#endif
                }
 }