diff options
Diffstat (limited to 'src/file-manager/fm-icon-view.c')
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index c348cbd6..a388a3fb 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -212,11 +212,7 @@ G_DEFINE_TYPE_WITH_CODE (FMIconView, fm_icon_view, FM_TYPE_DIRECTORY_VIEW, fm_icon_view_iface_init)); static void -#if GTK_CHECK_VERSION (3, 0, 0) fm_icon_view_destroy (GtkWidget *object) -#else -fm_icon_view_destroy (GtkObject *object) -#endif { FMIconView *icon_view; @@ -244,11 +240,7 @@ fm_icon_view_destroy (GtkObject *object) icon_view->details->icons_not_positioned = NULL; } -#if GTK_CHECK_VERSION (3, 0, 0) GTK_WIDGET_CLASS (fm_icon_view_parent_class)->destroy (object); -#else - GTK_OBJECT_CLASS (fm_icon_view_parent_class)->destroy (object); -#endif } static void @@ -2493,7 +2485,6 @@ fm_icon_view_scroll_event (GtkWidget *widget, gboolean ret; icon_view = FM_ICON_VIEW (widget); -#if GTK_CHECK_VERSION (3, 0, 0) if (icon_view->details->compact && (scroll_event->direction == GDK_SCROLL_UP || scroll_event->direction == GDK_SCROLL_DOWN || @@ -2517,22 +2508,7 @@ fm_icon_view_scroll_event (GtkWidget *widget, } if ((scroll_event_copy->direction == GDK_SCROLL_UP) || (scroll_event_copy->delta_x == -1.0)) -#else - - if (icon_view->details->compact && - (scroll_event->direction == GDK_SCROLL_UP || - scroll_event->direction == GDK_SCROLL_DOWN)) - { - ret = fm_directory_view_handle_scroll_event (FM_DIRECTORY_VIEW (icon_view), scroll_event); - if (!ret) - { - /* in column-wise layout, re-emit vertical mouse scroll events as horizontal ones, - * if they don't bump zoom */ - event_copy = gdk_event_copy ((GdkEvent *) scroll_event); - scroll_event_copy = (GdkEventScroll *) event_copy; - if (scroll_event_copy->direction == GDK_SCROLL_UP) -#endif { scroll_event_copy->direction = GDK_SCROLL_LEFT; } @@ -3182,11 +3158,8 @@ fm_icon_view_class_init (FMIconViewClass *klass) G_OBJECT_CLASS (klass)->set_property = fm_icon_view_set_property; G_OBJECT_CLASS (klass)->finalize = fm_icon_view_finalize; -#if !GTK_CHECK_VERSION (3, 0, 0) - GTK_OBJECT_CLASS (klass)->destroy = fm_icon_view_destroy; -#else + GTK_WIDGET_CLASS (klass)->destroy = fm_icon_view_destroy; -#endif GTK_WIDGET_CLASS (klass)->screen_changed = fm_icon_view_screen_changed; GTK_WIDGET_CLASS (klass)->scroll_event = fm_icon_view_scroll_event; |