dropped support for gtk < 2.20

diff --git a/src/bar.c b/src/bar.c
index a26b8fa..de4270c 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -457,11 +457,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
        if (!bd) return;
 
        WRITE_NL(); WRITE_STRING("<bar ");
-#if GTK_CHECK_VERSION(2,20,0)
        write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
-#else
-       write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
-#endif
        write_uint_option(outstr, indent, "width", bd->width);
        WRITE_STRING(">");
        

diff --git a/src/bar_comment.c b/src/bar_comment.c
index fff8e3a..e63695b 100644 (file)
--- a/src/bar_comment.c
+++ b/src/bar_comment.c
@@ -141,11 +141,7 @@ static gint bar_pane_comment_event(GtkWidget *bar, GdkEvent *event)
        pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
        if (!pcd) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_has_focus(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event);
-#else
-       if (GTK_WIDGET_HAS_FOCUS(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event);
-#endif
 
        return FALSE;
 }

diff --git a/src/bar_exif.c b/src/bar_exif.c
index 069bc44..aeae416 100644 (file)
--- a/src/bar_exif.c
+++ b/src/bar_exif.c
@@ -301,11 +301,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
                ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
                work = work->next;
 
-#if GTK_CHECK_VERSION(2,20,0)
                if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#else
-               if (ee->editable && GTK_WIDGET_HAS_FOCUS(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
-#endif
                }
        g_list_free(list);
        return ret;
@@ -403,11 +399,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *context,
                
                gtk_widget_get_allocation(entry, &allocation);
                
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_is_drawable(entry) &&
-#else
-               if (GTK_WIDGET_DRAWABLE(entry) && 
-#endif
                    gtk_widget_translate_coordinates(pane, entry, x, y, &nx, &ny) &&
                    ny < allocation.height / 2) break;
                pos++;

diff --git a/src/bar_histogram.c b/src/bar_histogram.c
index 01f6831..2f264a3 100644 (file)
--- a/src/bar_histogram.c
+++ b/src/bar_histogram.c
@@ -61,11 +61,7 @@ static void bar_pane_histogram_update(PaneHistogramData *phd)
        /* histmap_get is relatively expensive, run it only when we really need it
           and with lower priority than pixbuf_renderer 
           FIXME: this does not work for fullscreen*/
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_is_drawable(phd->drawing_area))
-#else
-       if (GTK_WIDGET_DRAWABLE(phd->drawing_area))
-#endif
                {
                if (!phd->idle_id)
                        {

diff --git a/src/bar_keywords.c b/src/bar_keywords.c
index 9a849bc..df70fda 100644 (file)
--- a/src/bar_keywords.c
+++ b/src/bar_keywords.c
@@ -264,11 +264,7 @@ gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
        pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
        if (!pkd) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_has_focus(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
-#else
-       if (GTK_WIDGET_HAS_FOCUS(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
-#endif
 
        return FALSE;
 }

diff --git a/src/bar_sort.c b/src/bar_sort.c
index 16eb85e..0fd95fa 100644 (file)
--- a/src/bar_sort.c
+++ b/src/bar_sort.c
@@ -724,11 +724,7 @@ void bar_sort_write_config(GtkWidget *bar, GString *outstr, gint indent)
        if (!sd) return;
 
        WRITE_NL(); WRITE_STRING("<bar_sort ");
-#if GTK_CHECK_VERSION(2,20,0)
        write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
-#else
-       write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
-#endif
        WRITE_INT(*sd, mode);
        WRITE_INT(*sd, action);
        WRITE_INT(*sd, selection);

diff --git a/src/cache_maint.c b/src/cache_maint.c
index 0da0a0b..1bb5b87 100644 (file)
--- a/src/cache_maint.c
+++ b/src/cache_maint.c
@@ -256,11 +256,7 @@ static void cache_maintain_home_close_cb(GenericDialog *gd, gpointer data)
 {
        CMData *cm = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cm->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cm->button_close)) return;
-#endif
 
        cache_maintain_home_close(cm);
 }
@@ -712,11 +708,7 @@ static void cache_manager_render_close_cb(GenericDialog *fd, gpointer data)
 {
        CleanData *cd = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
-#endif
 
        cache_manager_render_reset(cd);
        generic_dialog_close(cd->gd);
@@ -831,11 +823,7 @@ static void cache_manager_render_start_cb(GenericDialog *fd, gpointer data)
        CleanData *cd = data;
        gchar *path;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
-#else
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
-#endif
 
        path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd->entry))));
        parse_out_relatives(path);
@@ -932,11 +920,7 @@ static void cache_manager_standard_clean_close_cb(GenericDialog *gd, gpointer da
 {
        CleanData *cd = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
-#else
-       if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return;
-#endif
 
        generic_dialog_close(cd->gd);
 
@@ -1049,11 +1033,7 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da
        gchar *path;
        FileData *dir_fd;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return;
-#else
-       if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return;
-#endif
 
        gtk_widget_set_sensitive(cd->button_start, FALSE);
        gtk_widget_set_sensitive(cd->button_stop, TRUE);

diff --git a/src/cellrenderericon.c b/src/cellrenderericon.c
index 9139b96..ad6375e 100644 (file)
--- a/src/cellrenderericon.c
+++ b/src/cellrenderericon.c
@@ -678,22 +678,14 @@ gqv_cell_renderer_icon_render(GtkCellRenderer             *cell,
 
        if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_has_focus(widget))
-#else
-               if (GTK_WIDGET_HAS_FOCUS(widget))
-#endif
                        state = GTK_STATE_SELECTED;
                else
                        state = GTK_STATE_ACTIVE;
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE)
-#else
-               if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE)
-#endif
                        state = GTK_STATE_INSENSITIVE;
                else
                        state = GTK_STATE_NORMAL;
@@ -836,11 +828,7 @@ gqv_cell_renderer_icon_render(GtkCellRenderer              *cell,
                        }
                 }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (cellicon->focused && gtk_widget_has_focus(widget))
-#else
-       if (cellicon->focused && GTK_WIDGET_HAS_FOCUS(widget))
-#endif
                {
 #if GTK_CHECK_VERSION(3,0,0)
 #else

diff --git a/src/collect-table.c b/src/collect-table.c
index 5e378a7..6ebf405 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -539,11 +539,7 @@ static void tip_show(CollectTable *ct)
 
        gdk_window_get_pointer(NULL, &x, &y, NULL);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
-#else
-       if (!GTK_WIDGET_REALIZED(ct->tip_window)) gtk_widget_realize(ct->tip_window);
-#endif
        gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
        gtk_widget_show(ct->tip_window);
 }
@@ -1574,11 +1570,7 @@ static gboolean collection_table_press_cb(GtkWidget *widget, GdkEventButton *bev
                                        layout_image_set_collection(NULL, ct->cd, info);
                                        }
                                }
-#if GTK_CHECK_VERSION(2,20,0)
                        else if (!gtk_widget_has_focus(ct->listview))
-#else
-                       else if (!GTK_WIDGET_HAS_FOCUS(ct->listview))
-#endif
                                {
                                gtk_widget_grab_focus(ct->listview);
                                }
@@ -1729,11 +1721,7 @@ static void collection_table_populate(CollectTable *ct, gboolean resize)
                        gtk_tree_view_column_set_visible(column, (i < ct->columns));
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
-#if GTK_CHECK_VERSION(2,18,0)
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-                       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
                        cell = (list) ? list->data : NULL;
                        g_list_free(list);
 
@@ -1744,11 +1732,7 @@ static void collection_table_populate(CollectTable *ct, gboolean resize)
                                                             "show_text", ct->show_text, NULL);
                                }
                        }
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_realized(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
-#else
-               if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
-#endif
                }
 
        row = -1;

diff --git a/src/compat.c b/src/compat.c
index 4574f6b..7458d2d 100644 (file)
--- a/src/compat.c
+++ b/src/compat.c
@@ -12,49 +12,6 @@
 #include "main.h"
 #include "compat.h"
 
-/* gtk_radio_action_set_current_value() replacement for GTK+ < 2.10 */
-void radio_action_set_current_value(GtkRadioAction *action, gint current_value)
-{
-#if GTK_CHECK_VERSION(2, 10, 0)
-       gtk_radio_action_set_current_value(action, current_value);
-#else
-       GSList *group;
-       gint value;
-
-       group = gtk_radio_action_get_group(action);
-       while (group)
-               {
-               action = GTK_RADIO_ACTION(group->data);
-               g_object_get(G_OBJECT(action), "value", &value, NULL);
-               if (value == current_value)
-                       {
-                       gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
-                       return;
-                       }
-               group = g_slist_next(group);
-               }
-#endif
-}
-
-#if !GLIB_CHECK_VERSION(2, 14, 0)
-static void hash_table_add(gpointer key, gpointer value, gpointer user_data)
-{
-       GList **list = user_data;
-       *list = g_list_prepend(*list, key);
-}
-#endif
-
-GList* hash_table_get_keys(GHashTable *hash_table)
-{
-#if GLIB_CHECK_VERSION(2, 14, 0)
-       return g_hash_table_get_keys(hash_table);
-#else
-       GList *list = NULL;
-       g_hash_table_foreach(hash_table, hash_table_add, &list);
-       return list;
-#endif
-}
-
 #if !GTK_CHECK_VERSION(2,24,0)
 gint compat_gdk_window_get_width(GdkWindow *window)
 {

diff --git a/src/compat.h b/src/compat.h
index 98cf22b..fe55f48 100644 (file)
--- a/src/compat.h
+++ b/src/compat.h
@@ -13,13 +13,6 @@
 #ifndef COMPAT_H
 #define COMPAT_H
 
-void radio_action_set_current_value(GtkRadioAction *action, gint current_value);
-GList* hash_table_get_keys(GHashTable *hash_table);
-
-#if !GTK_CHECK_VERSION(2,12,0)
-#define gtk_widget_set_tooltip_text(widget, text) /* ignored */
-#endif
-
 
 /* Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS */
 #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)

diff --git a/src/dupe.c b/src/dupe.c
index 2c0df5d..9d8f72f 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2216,11 +2216,7 @@ static GList *dupe_window_get_fd_list(DupeWindow *dw)
 {
        GList *list;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_has_focus(dw->second_listview))
-#else
-       if (GTK_WIDGET_HAS_FOCUS(dw->second_listview))
-#endif
                {
                list = dupe_listview_get_selection(dw, dw->second_listview);
                }
@@ -2773,11 +2769,7 @@ static void dupe_listview_set_height(GtkWidget *listview, gboolean thumb)
 
        gtk_tree_view_column_set_fixed_width(column, (thumb) ? options->thumbnails.max_width : 4);
 
-#if GTK_CHECK_VERSION(2,18,0)
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
        if (!list) return;
        cell = list->data;
        g_list_free(list);
@@ -2864,11 +2856,7 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
        GList *slist;
        DupeItem *di = NULL;
 
-#if GTK_CHECK_VERSION(2,20,0)
        on_second = gtk_widget_has_focus(dw->second_listview);
-#else
-       on_second = GTK_WIDGET_HAS_FOCUS(dw->second_listview);
-#endif
 
        if (on_second)
                {

diff --git a/src/image.c b/src/image.c
index bde4157..b6a91bf 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1796,19 +1796,11 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
        if (frame)
                {
                imd->frame = gtk_frame_new(NULL);
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_ref(imd->pr);
-#else
-               gtk_widget_ref(imd->pr);
-#endif
                if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
                gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
 
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_unref(imd->pr);
-#else
-               gtk_widget_unref(imd->pr);
-#endif
                gtk_widget_set_can_focus(imd->frame, TRUE);
                gtk_widget_set_app_paintable(imd->frame, TRUE);
                
@@ -1822,37 +1814,21 @@ void image_set_frame(ImageWindow *imd, gboolean frame)
                g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
                                 G_CALLBACK(image_focus_in_cb), imd);
 
-#if GTK_CHECK_VERSION(2,14,0)
                gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
-#else
-               gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame);
-#endif
                gtk_widget_show(imd->frame);
                }
        else
                {
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_ref(imd->pr);
-#else
-               gtk_widget_ref(imd->pr);
-#endif
                if (imd->frame)
                        {
                        gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
                        gtk_widget_destroy(imd->frame);
                        imd->frame = NULL;
                        }
-#if GTK_CHECK_VERSION(2,14,0)
                gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
-#else
-               gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
-#endif
 
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_unref(imd->pr);
-#else
-               gtk_widget_unref(imd->pr);
-#endif
                }
 
        gtk_widget_show(imd->pr);

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
                }
 }
 

diff --git a/src/layout_image.c b/src/layout_image.c
index 152f281..c520942 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1616,11 +1616,7 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
                {
                lw->split_images[i] = image_new(TRUE);
 
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_ref(lw->split_images[i]->widget);
-#else
-               gtk_widget_ref(lw->split_images[i]->widget);
-#endif
 
                g_signal_connect(G_OBJECT(lw->split_images[i]->pr), "update-pixel",
                                 G_CALLBACK(layout_status_update_pixel_cb), lw);
@@ -1759,11 +1755,7 @@ static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
                {
                if (lw->split_images[i])
                        {
-#if GTK_CHECK_VERSION(2,12,0)
                        g_object_unref(lw->split_images[i]->widget);
-#else
-                       gtk_widget_unref(lw->split_images[i]->widget);
-#endif
                        lw->split_images[i] = NULL;
                        }
                }

diff --git a/src/layout_util.c b/src/layout_util.c
index 1d13541..605df21 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -90,11 +90,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
        gint x = 0;
        gint y = 0;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (lw->path_entry && gtk_widget_has_focus(lw->path_entry))
-#else
-       if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry))
-#endif
                {
                if (event->keyval == GDK_KEY_Escape && lw->dir_fd)
                        {
@@ -109,11 +105,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                        return TRUE;
                        }
                }
-#if GTK_CHECK_VERSION(2,20,0)
        if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && gtk_widget_has_focus(lw->vd->view) &&
-#else
-       if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) &&
-#endif
            !layout_key_match(event->keyval) &&
            gtk_widget_event(lw->vd->view, (GdkEvent *)event))
                {
@@ -133,11 +125,7 @@ gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
        focused = gtk_container_get_focus_child(GTK_CONTAINER(lw->image->widget));
        if (lw->image &&
-#if GTK_CHECK_VERSION(2,20,0)
            (focused && gtk_widget_has_focus(focused) || (lw->tools && widget == lw->window) || lw->full_screen) )
-#else
-           (focused && GTK_WIDGET_HAS_FOCUS(focused) || (lw->tools && widget == lw->window) || lw->full_screen) )
-#endif
                {
                stop_signal = TRUE;
                switch (event->keyval)
@@ -848,7 +836,7 @@ static void layout_menu_stereo_mode_next_cb(GtkAction *action, gpointer data)
        mode = mode % 3 + 1;
        
        GtkAction *radio = gtk_action_group_get_action(lw->action_group, "StereoAuto");
-       radio_action_set_current_value(GTK_RADIO_ACTION(radio), mode);
+       gtk_radio_action_set_current_value(GTK_RADIO_ACTION(radio), mode);
        
        /*
        this is called via fallback in layout_menu_stereo_mode_cb
@@ -2375,13 +2363,13 @@ static void layout_util_sync_views(LayoutWindow *lw)
        if (!lw->action_group) return;
 
        action = gtk_action_group_get_action(lw->action_group, "FolderTree");
-       radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
+       gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
 
        action = gtk_action_group_get_action(lw->action_group, "SplitSingle");
-       radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
+       gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
 
        action = gtk_action_group_get_action(lw->action_group, "ViewIcons");
-       radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type);
+       gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type);
 
        action = gtk_action_group_get_action(lw->action_group, "FloatTools");
        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.tools_float);
@@ -2413,17 +2401,17 @@ static void layout_util_sync_views(LayoutWindow *lw)
        if (osd_flags & OSD_SHOW_HISTOGRAM)
                {
                action = gtk_action_group_get_action(lw->action_group, "HistogramChanR");
-               radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image));
+               gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image));
 
                action = gtk_action_group_get_action(lw->action_group, "HistogramModeLin");
-               radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image));
+               gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image));
                }
 
        action = gtk_action_group_get_action(lw->action_group, "ConnectZoomMenu");
        gtk_action_set_sensitive(action, lw->split_mode != SPLIT_NONE);
 
        action = gtk_action_group_get_action(lw->action_group, "StereoAuto");
-       radio_action_set_current_value(GTK_RADIO_ACTION(action), layout_image_stereo_pixbuf_get(lw));
+       gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), layout_image_stereo_pixbuf_get(lw));
 
        layout_util_sync_color(lw);
 }
@@ -2456,11 +2444,7 @@ void layout_util_sync(LayoutWindow *lw)
 
 static gboolean layout_bar_enabled(LayoutWindow *lw)
 {
-#if GTK_CHECK_VERSION(2,20,0)
        return lw->bar && gtk_widget_get_visible(lw->bar);
-#else
-       return lw->bar && GTK_WIDGET_VISIBLE(lw->bar);
-#endif
 }
 
 static void layout_bar_destroyed(GtkWidget *widget, gpointer data)
@@ -2553,11 +2537,7 @@ static void layout_bar_new_selection(LayoutWindow *lw, gint count)
 
 static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
 {
-#if GTK_CHECK_VERSION(2,20,0)
        return lw->bar_sort && gtk_widget_get_visible(lw->bar_sort);
-#else
-       return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort);
-#endif
 }
 
 

diff --git a/src/logwindow.c b/src/logwindow.c
index 8f27080..5c652ed 100644 (file)
--- a/src/logwindow.c
+++ b/src/logwindow.c
@@ -270,11 +270,7 @@ void log_window_append(const gchar *str, LogType type)
 
        log_window_insert_text(buffer, &iter, str, logdefs[type].tag);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_visible(text))
-#else
-       if (GTK_WIDGET_VISIBLE(text))
-#endif
                {
                GtkTextMark *mark;
                

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));
                                }

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index e93536d..9df2271 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -2056,11 +2056,7 @@ static gboolean pr_mouse_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpo
                }
 
        parent = gtk_widget_get_parent(widget);
-#if GTK_CHECK_VERSION(2,20,0)
        if (widget && gtk_widget_get_can_focus(parent))
-#else
-       if (widget && GTK_WIDGET_CAN_FOCUS(parent))
-#endif
                {
                gtk_widget_grab_focus(parent);
                }
@@ -2080,11 +2076,7 @@ static gboolean pr_mouse_release_cb(GtkWidget *widget, GdkEventButton *bevent, g
                return TRUE;
                }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(GTK_WIDGET(pr)))
-#else
-       if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(pr))
-#endif
                {
                gtk_grab_remove(widget);
                gdk_pointer_ungrab(bevent->time);

diff --git a/src/preferences.c b/src/preferences.c
index 6cd2165..dad1bf8 100644 (file)
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -990,7 +990,6 @@ static void image_overlay_help_cb(GtkWidget *widget, gpointer data)
        help_window_show("overlay");
 }
 
-#if GTK_CHECK_VERSION(2, 10, 0)
 static void accel_store_populate(void)
 {
        LayoutWindow *lw;
@@ -1287,7 +1286,6 @@ static void accel_default_ok_cb(GenericDialog *gd, gpointer data)
        accel_store_populate();
 }
 
-#endif
 #endif
 
 static GtkWidget *scrolled_notebook_page(GtkWidget *notebook, const gchar *title)
@@ -1541,7 +1539,6 @@ static void config_tab_windows(GtkWidget *notebook)
 
        image_overlay_template_view = gtk_text_view_new();
 
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_widget_set_tooltip_markup(image_overlay_template_view,
        _("<i>%name%</i> results in the filename of the picture.\n"
          "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>%date%</i>,\n"
@@ -1553,8 +1550,7 @@ static void config_tab_windows(GtkWidget *notebook)
          "<i>%formatted.ShutterSpeed%</i>|<i>%formatted.ISOSpeedRating%</i>|<i>%formatted.FocalLength%</i> could show \"1/20s - 400 - 80 mm\" or \"1/200 - 80 mm\",\n"
          "if there's no ISO information in the Exif data.\n"
          "If a line is empty, it is removed. This allows one to add lines that totally disappear when no data is available.\n"
-));
-#endif
+       ));
        gtk_container_add(GTK_CONTAINER(scrolled), image_overlay_template_view);
        gtk_widget_show(image_overlay_template_view);
 
@@ -1963,9 +1959,7 @@ static void config_tab_behavior(GtkWidget *notebook)
        pref_spacer(hbox, PREF_PAD_INDENT - PREF_PAD_GAP);
        spin = pref_spin_new_int(hbox, _("Maximum size:"), _("MB"),
                                 0, 2048, 1, options->file_ops.safe_delete_folder_maxsize, &c_options->file_ops.safe_delete_folder_maxsize);
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_widget_set_tooltip_markup(spin, _("Set to 0 for unlimited size"));
-#endif
        button = pref_button_new(NULL, NULL, _("View"), FALSE,
                                 G_CALLBACK(safe_delete_view_cb), NULL);
        gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -2018,7 +2012,6 @@ static void config_tab_behavior(GtkWidget *notebook)
 /* accelerators tab */
 static void config_tab_accelerators(GtkWidget *notebook)
 {
-#if GTK_CHECK_VERSION(2, 10, 0)
        GtkWidget *hbox;
        GtkWidget *vbox;
        GtkWidget *group;
@@ -2132,7 +2125,6 @@ static void config_tab_accelerators(GtkWidget *notebook)
        gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 #endif
-#endif
 }
 
 /* stereo tab */

diff --git a/src/print.c b/src/print.c
index 07ebd50..bcdd629 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1959,11 +1959,7 @@ static void print_job_throw_error(PrintWindow *pw, const gchar *message)
        GtkWidget *label;
        gchar *buf;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_visible(pw->dialog->dialog)) parent = pw->dialog->dialog;
-#else
-       if (GTK_WIDGET_VISIBLE(pw->dialog->dialog)) parent = pw->dialog->dialog;
-#endif
 
        gd = generic_dialog_new(_("Printing error"), "print_warning",
                                parent, TRUE, NULL, NULL);
@@ -2489,11 +2485,7 @@ static void print_job_close(PrintWindow *pw, gint error)
                pw->job_pixbuf = NULL;
                }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (pw->dialog && !gtk_widget_get_visible(pw->dialog->dialog))
-#else
-       if (pw->dialog && !GTK_WIDGET_VISIBLE(pw->dialog->dialog))
-#endif
                {
                g_idle_add_full(G_PRIORITY_HIGH_IDLE, print_job_close_finish_cb, pw, NULL);
                }

diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index 7778716..bf8e5ee 100644 (file)
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -1488,16 +1488,6 @@ static void rt_tile_expose(RendererTiles *rt, ImageTile *it,
        cairo_fill (cr);
        cairo_destroy (cr);
 
-#if 0
-#if GTK_CHECK_VERSION(2,20,0)
-       gdk_draw_drawable(window, box->style->fg_gc[gtk_widget_get_state(box)],
-#else
-       gdk_draw_drawable(window, box->style->fg_gc[GTK_WIDGET_STATE(box)],
-#endif
-                         it->pixmap, x, y,
-                         pr->x_offset + (it->x - rt->x_scroll) + x + rt->stereo_off_x, pr->y_offset + (it->y - rt->y_scroll) + y + rt->stereo_off_y, w, h);
-#endif
-
        if (rt->overlay_list)
                {
                rt_overlay_draw(rt, pr->x_offset + (it->x - rt->x_scroll) + x,
@@ -1617,11 +1607,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data)
                fast = FALSE;
                }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_realized(pr))
-#else
-       if (GTK_WIDGET_REALIZED(pr))
-#endif
                {
                if (rt_tile_is_visible(rt, qd->it))
                        {
@@ -1953,15 +1939,6 @@ static void rt_scroll(void *renderer, gint x_off, gint y_off)
                cairo_pop_group_to_source(cr);
                cairo_paint(cr);
                cairo_destroy(cr);
-#if 0
-               gc = gdk_gc_new(window);
-               gdk_gc_set_exposures(gc, TRUE);
-               gdk_draw_drawable(window, gc,
-                                 window,
-                                 x2 + pr->x_offset + rt->stereo_off_x, y2 + pr->y_offset + rt->stereo_off_y,
-                                 x1 + pr->x_offset + rt->stereo_off_x, y1 + pr->y_offset + rt->stereo_off_y, w, h);
-               g_object_unref(gc);
-#endif
 
                rt_overlay_queue_all(rt, x2, y2, x1, y1);
 
@@ -1981,22 +1958,6 @@ static void rt_scroll(void *renderer, gint x_off, gint y_off)
                                    rt->x_scroll, y_off > 0 ? rt->y_scroll + (pr->vis_height - h) : rt->y_scroll,
                                    pr->vis_width, h, TRUE, TILE_RENDER_ALL, FALSE, FALSE);
                        }
-
-               /* process exposures here, "expose_event" seems to miss a few with obstructed windows */
-#if ! GTK_CHECK_VERSION(2,18,0)
-               while ((event = gdk_event_get_graphics_expose(window)) != NULL)
-                       {
-                       renderer_redraw((void *) rt, event->expose.area.x, event->expose.area.y, event->expose.area.width, event->expose.area.height,
-                              FALSE, TILE_RENDER_ALL, FALSE, FALSE);
- 
-                       if (event->expose.count == 0)
-                               {
-                               gdk_event_free(event);
-                               break;
-                               }
-                       gdk_event_free(event);
-                       }
-#endif
                }
 }
 
@@ -2155,17 +2116,9 @@ static gboolean rt_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
 static gboolean rt_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
        RendererTiles *rt = (RendererTiles *)data;
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_is_drawable(widget))
-#else
-       if (GTK_WIDGET_DRAWABLE(widget))
-#endif
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_has_window(widget))
-#else
-               if (!GTK_WIDGET_NO_WINDOW(widget))
-#endif
                        {
                        if (event->window != gtk_widget_get_window(widget))
                                {

diff --git a/src/search.c b/src/search.c
index 8058ae8..8857629 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -824,11 +824,7 @@ static void search_result_thumb_height(SearchData *sd)
 
        gtk_tree_view_column_set_fixed_width(column, (sd->thumb_enable) ? options->thumbnails.max_width : 4);
 
-#if GTK_CHECK_VERSION(2,18,0)
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
        if (!list) return;
        cell = list->data;
        g_list_free(list);
@@ -2347,19 +2343,11 @@ static void menu_choice_set_visible(GtkWidget *widget, gboolean visible)
 {
        if (visible)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (!gtk_widget_get_visible(widget)) gtk_widget_show(widget);
-#else
-               if (!GTK_WIDGET_VISIBLE(widget)) gtk_widget_show(widget);
-#endif
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(widget)) gtk_widget_hide(widget);
-#else
-               if (GTK_WIDGET_VISIBLE(widget)) gtk_widget_hide(widget);
-#endif
                }
 }
 

diff --git a/src/ui_misc.c b/src/ui_misc.c
index 9b28597..2aef411 100644 (file)
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -556,11 +556,7 @@ static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType prev_state,
 {
        GtkWidget *widget = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
-#else
-       gtk_widget_set_sensitive(widget, GTK_WIDGET_IS_SENSITIVE(watch));
-#endif
 }
 
 void pref_link_sensitivity(GtkWidget *widget, GtkWidget *watch)
@@ -741,23 +737,9 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
 }
 
 
-#if ! GTK_CHECK_VERSION(2,12,0)
-
-static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data)
-{
-       GtkTooltips *tips = data;
-
-       g_object_unref(G_OBJECT(tips));
-}
-
-#endif
-
 GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
 {
        GtkWidget *tbar;
-#if ! GTK_CHECK_VERSION(2,12,0)
-       GtkTooltips *tips;
-#endif
        
        tbar = gtk_toolbar_new();
        gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
@@ -767,27 +749,6 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
                gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
                gtk_widget_show(tbar);
                }
-
-#if ! GTK_CHECK_VERSION(2,12,0)
-       tips = gtk_tooltips_new();
-
-       /* take ownership of tooltips */
-#  ifdef GTK_OBJECT_FLOATING
-       /* GTK+ < 2.10 */
-       g_object_ref(G_OBJECT(tips));
-       gtk_object_sink(GTK_OBJECT(tips));
-#  else
-       /* GTK+ >= 2.10 */
-       g_object_ref_sink(G_OBJECT(tips));
-#  endif
-
-       g_object_set_data(G_OBJECT(tbar), "tooltips", tips);
-       g_signal_connect(G_OBJECT(tbar), "destroy",
-                        G_CALLBACK(pref_toolbar_destroy_cb), tips);
-
-       gtk_tooltips_enable(tips);
-#endif
-
        return tbar;
 }
 
@@ -830,18 +791,8 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
 
        if (description)
                {
-
-#if GTK_CHECK_VERSION(2,12,0)
-
                gtk_widget_set_tooltip_text(item, description);
-                       
-#else
-               GtkTooltips *tips;
-
-               tips = g_object_get_data(G_OBJECT(toolbar), "tooltips");
-               gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL);
-#endif
-       }
+               }
 
        return item;
 }
@@ -899,11 +850,7 @@ static void date_selection_popup_hide(DateSelection *ds)
 {
        if (!ds->window) return;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_has_grab(ds->window))
-#else
-       if (GTK_WIDGET_HAS_GRAB(ds->window))
-#endif
                {
                gtk_grab_remove(ds->window);
                gdk_keyboard_ungrab(GDK_CURRENT_TIME);
@@ -1338,11 +1285,7 @@ static gboolean sizer_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpoi
 
        if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(sd->sizer))
-#else
-       if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(sd->sizer))
-#endif
                {
                gtk_grab_remove(sd->sizer);
                gdk_pointer_ungrab(bevent->time);

diff --git a/src/ui_tabcomp.c b/src/ui_tabcomp.c
index 6d4b060..8bed19c 100644 (file)
--- a/src/ui_tabcomp.c
+++ b/src/ui_tabcomp.c
@@ -206,11 +206,7 @@ void tab_completion_iter_menu_items(GtkWidget *widget, gpointer data)
        TabCompData *td = data;
        GtkWidget *child;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_visible(widget)) return;
-#else
-       if (!GTK_WIDGET_VISIBLE(widget)) return;
-#endif
 
        child = gtk_bin_get_child(GTK_BIN(widget));
        if (GTK_IS_LABEL(child)) {
@@ -260,11 +256,7 @@ static gboolean tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *e
                /* close the menu */
                gtk_menu_popdown(GTK_MENU(widget));
                /* doing this does not emit the "selection done" signal, unref it ourselves */
-#if GTK_CHECK_VERSION(2,12,0)
                g_object_unref(widget);
-#else
-               gtk_widget_unref(widget);
-#endif
                return TRUE;
                }
 
@@ -655,11 +647,7 @@ static void tab_completion_button_pressed(GtkWidget *widget, gpointer data)
 
        if (!td) return;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_has_focus(entry))
-#else
-       if (!GTK_WIDGET_HAS_FOCUS(entry))
-#endif
                {
                gtk_widget_grab_focus(entry);
                }

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index d1f6b50..afb5686 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -188,20 +188,12 @@ gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, c
        GList *work;
 
        if (!edit_func) return FALSE;
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_visible(GTK_WIDGET(tree))) return FALSE;
-#else
-       if (!GTK_WIDGET_VISIBLE(tree)) return FALSE;
-#endif
 
        tcolumn = gtk_tree_view_get_column(tree, column);
        if (!tcolumn) return FALSE;
 
-#if GTK_CHECK_VERSION(2,18,0)
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(tcolumn));
-#else
-       list = gtk_tree_view_column_get_cell_renderers(tcolumn);
-#endif
        work = list;
        while (work && !cell)
                {
@@ -277,11 +269,7 @@ gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint
         * use x_offset instead for X scroll (sigh)
         */
        gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect);
-#if GTK_CHECK_VERSION(2,12,0)
        gtk_tree_view_convert_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
-#else
-       gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset);
-#endif
        gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(widget)), &x_origin, &y_origin);
 
        if (gtk_tree_view_get_headers_visible(widget))
@@ -307,11 +295,7 @@ gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint
                gint cell_x;
                gint cell_width;
 
-#if GTK_CHECK_VERSION(2,18,0)
                renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(tv_column));
-#else
-               renderers = gtk_tree_view_column_get_cell_renderers(tv_column);
-#endif
                work = renderers;
                while (work && !cell)
                        {
@@ -368,7 +352,6 @@ void tree_view_get_cell_clamped(GtkTreeView *widget, GtkTreePath *tpath, gint co
        *height = MIN(*height, wy + wh - (*y));
 }
 
-#if GTK_CHECK_VERSION(2,8,0)
 /* an implementation that uses gtk_tree_view_get_visible_range */
 gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible)
 {
@@ -410,47 +393,6 @@ gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboole
        return ret;
 }
 
-#else 
-/* an implementation that uses gtk_tree_view_get_visible_rect, it seems to be more error prone than the variant above */
-
-gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible)
-{
-       GtkTreeModel *store;
-       GtkTreePath *tpath;
-       gint cx, cy;
-
-       GdkRectangle vrect;
-       GdkRectangle crect;
-
-       if (!GTK_WIDGET_REALIZED(GTK_WIDGET(widget))) return -1; /* we will most probably scroll down, needed for tree_view_row_make_visible */
-
-       store = gtk_tree_view_get_model(widget);
-       tpath = gtk_tree_model_get_path(store, iter);
-
-       gtk_tree_view_get_visible_rect(widget, &vrect);
-       gtk_tree_view_get_cell_area(widget, tpath, NULL, &crect);
-       gtk_tree_path_free(tpath);
-
-
-#if GTK_CHECK_VERSION(2,12,0)
-       gtk_tree_view_convert_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy);
-#else
-       gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy);
-#endif
-
-       if (fully_visible)
-               {
-               if (cy < vrect.y) return -1;
-               if (cy + crect.height > vrect.y + vrect.height) return 1;
-               return 0;
-               }
-
-       if (cy + crect.height < vrect.y) return -1;
-       if (cy > vrect.y + vrect.height) return 1;
-       return 0;
-}
-#endif
-
 gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gboolean center)
 {
        GtkTreePath *tpath;

diff --git a/src/ui_utildlg.c b/src/ui_utildlg.c
index ddc2c89..108c121 100644 (file)
--- a/src/ui_utildlg.c
+++ b/src/ui_utildlg.c
@@ -62,11 +62,7 @@ static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventK
 {
        GenericDialog *gd = data;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
-#else
-       if (event->keyval == GDK_KEY_Return && GTK_WIDGET_HAS_FOCUS(widget)
-#endif
            && gd->default_cb)
                {
                gboolean auto_close;
@@ -238,11 +234,7 @@ static void generic_dialog_setup(GenericDialog *gd,
                        GtkWidget *top;
 
                        top = gtk_widget_get_toplevel(parent);
-#if GTK_CHECK_VERSION(2,20,0)
                        if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top);
-#else
-                       if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top);
-#endif
                        }
 
                if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window);

diff --git a/src/utilops.c b/src/utilops.c
index 07a8427..de1a6c6 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -1849,7 +1849,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        
        if (fd && fd->modified_xmp)
                {
-               keys = hash_table_get_keys(fd->modified_xmp);
+               keys = g_hash_table_get_keys(fd->modified_xmp);
                }
        
        g_assert(keys);

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index ad51655..4f34da7 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -96,11 +96,7 @@ static void vdlist_scroll_to_row(ViewDir *vd, FileData *fd, gfloat y_align)
 {
        GtkTreeIter iter;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_realized(vd->view) && vd_find_row(vd, fd, &iter))
-#else
-       if (GTK_WIDGET_REALIZED(vd->view) && vd_find_row(vd, fd, &iter))
-#endif
                {
                GtkTreeModel *store;
                GtkTreePath *tpath;
@@ -111,11 +107,7 @@ static void vdlist_scroll_to_row(ViewDir *vd, FileData *fd, gfloat y_align)
                gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
                gtk_tree_path_free(tpath);
 
-#if GTK_CHECK_VERSION(2,20,0)
                if (!gtk_widget_has_focus(vd->view)) gtk_widget_grab_focus(vd->view);
-#else
-               if (!GTK_WIDGET_HAS_FOCUS(vd->view)) gtk_widget_grab_focus(vd->view);
-#endif
                }
 }
 
@@ -339,11 +331,7 @@ gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd)
                return ret;
                }
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_realized(vd->view))
-#else
-       if (GTK_WIDGET_REALIZED(vd->view))
-#endif
                {
                gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(vd->view), 0, 0);
                }

diff --git a/src/view_file.c b/src/view_file.c
index af11dd9..f96aa12 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -878,11 +878,7 @@ static gboolean vf_thumb_next(ViewFile *vf)
 {
        FileData *fd = NULL;
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_realized(vf->listview))
-#else
-       if (!GTK_WIDGET_REALIZED(vf->listview))
-#endif
                {
                vf_thumb_status(vf, 0.0, NULL);
                return FALSE;

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index acf07d4..007a69d 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -433,11 +433,7 @@ static void tip_show(ViewFile *vf)
 
        gdk_window_get_pointer(NULL, &x, &y, NULL);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
-#else
-       if (!GTK_WIDGET_REALIZED(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
-#endif
        gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
        gtk_widget_show(VFICON(vf)->tip_window);
 }
@@ -457,11 +453,7 @@ static gboolean tip_schedule_cb(gpointer data)
 
        window = gtk_widget_get_toplevel(vf->listview);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (gtk_widget_get_sensitive(window) &&
-#else
-       if (GTK_WIDGET_SENSITIVE(window) &&
-#endif
            gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
                {
                tip_show(vf);
@@ -1446,11 +1438,7 @@ gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer dat
        switch (bevent->button)
                {
                case MOUSE_BUTTON_LEFT:
-#if GTK_CHECK_VERSION(2,20,0)
                        if (!gtk_widget_has_focus(vf->listview))
-#else
-                       if (!GTK_WIDGET_HAS_FOCUS(vf->listview))
-#endif
                                {
                                gtk_widget_grab_focus(vf->listview);
                                }
@@ -1613,11 +1601,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (keep_position && gtk_widget_get_realized(vf->listview) &&
-#else
-       if (keep_position && GTK_WIDGET_REALIZED(vf->listview) &&
-#endif
            gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
                {
                GtkTreeIter iter;
@@ -1650,11 +1634,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                        gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->columns));
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
-#if GTK_CHECK_VERSION(2,18,0)
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-                       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
                        cell = (list) ? list->data : NULL;
                        g_list_free(list);
 
@@ -1668,11 +1648,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                                                             NULL);
                                }
                        }
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_realized(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
-#else
-               if (GTK_WIDGET_REALIZED(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
-#endif
                }
 
        r = -1;

diff --git a/src/view_file_list.c b/src/view_file_list.c
index 60742a0..dc225e4 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -1694,11 +1694,7 @@ static void vflist_listview_set_columns(GtkWidget *listview, gboolean thumb, gbo
 
        gtk_tree_view_column_set_fixed_width(column, options->thumbnails.max_width + 4);
 
-#if GTK_CHECK_VERSION(2,18,0)
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
        if (!list) return;
        cell = list->data;
        g_list_free(list);