diff options
| author | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
| commit | 4c06cb5cd0859067769dac1317682d430b18cc78 (patch) | |
| tree | 0c363ee71311366fb2016df9858858ef5ef2d25d /plugins/filebrowser/pluma-file-browser-view.c | |
| parent | 65371f53dbb06180b750dad7c19e7bcf0f8651d6 (diff) | |
| download | pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.bz2 pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'plugins/filebrowser/pluma-file-browser-view.c')
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-view.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-view.c b/plugins/filebrowser/pluma-file-browser-view.c index 847743b3..65728b0f 100644 --- a/plugins/filebrowser/pluma-file-browser-view.c +++ b/plugins/filebrowser/pluma-file-browser-view.c @@ -114,11 +114,7 @@ pluma_file_browser_view_finalize (GObject * object) PlumaFileBrowserView *obj = PLUMA_FILE_BROWSER_VIEW(object); if (obj->priv->hand_cursor) -#if GTK_CHECK_VERSION (3, 0, 0) g_object_unref (obj->priv->hand_cursor); -#else - gdk_cursor_unref (obj->priv->hand_cursor); -#endif if (obj->priv->hover_path) gtk_tree_path_free (obj->priv->hover_path); @@ -129,11 +125,7 @@ pluma_file_browser_view_finalize (GObject * object) obj->priv->expand_state = NULL; } -#if GTK_CHECK_VERSION (3, 0, 0) g_object_unref (obj->priv->busy_cursor); -#else - gdk_cursor_unref (obj->priv->busy_cursor); -#endif G_OBJECT_CLASS (pluma_file_browser_view_parent_class)-> finalize (object); @@ -316,12 +308,8 @@ set_click_policy_property (PlumaFileBrowserView *obj, if (click_policy == PLUMA_FILE_BROWSER_VIEW_CLICK_POLICY_SINGLE) { if (obj->priv->hand_cursor == NULL) -#if GTK_CHECK_VERSION (3, 16, 0) display = gtk_widget_get_display (GTK_WIDGET (obj)); obj->priv->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2); -#else - obj->priv->hand_cursor = gdk_cursor_new(GDK_HAND2); -#endif } else if (click_policy == PLUMA_FILE_BROWSER_VIEW_CLICK_POLICY_DOUBLE) { if (obj->priv->hover_path != NULL) { if (gtk_tree_model_get_iter (GTK_TREE_MODEL (obj->priv->model), @@ -344,11 +332,7 @@ set_click_policy_property (PlumaFileBrowserView *obj, } if (obj->priv->hand_cursor) { -#if GTK_CHECK_VERSION (3, 0, 0) g_object_unref (obj->priv->hand_cursor); -#else - gdk_cursor_unref (obj->priv->hand_cursor); -#endif obj->priv->hand_cursor = NULL; } } @@ -962,9 +946,8 @@ cell_data_cb (GtkTreeViewColumn * tree_column, GtkCellRenderer * cell, static void pluma_file_browser_view_init (PlumaFileBrowserView * obj) { -#if GTK_CHECK_VERSION (3, 16, 0) GdkDisplay *display; -#endif + obj->priv = PLUMA_FILE_BROWSER_VIEW_GET_PRIVATE (obj); obj->priv->column = gtk_tree_view_column_new (); @@ -999,12 +982,8 @@ pluma_file_browser_view_init (PlumaFileBrowserView * obj) G_N_ELEMENTS (drag_source_targets), GDK_ACTION_COPY); -#if GTK_CHECK_VERSION (3, 16, 0) display = gtk_widget_get_display (GTK_WIDGET (obj)); obj->priv->busy_cursor = gdk_cursor_new_for_display (display, GDK_WATCH); -#else - obj->priv->busy_cursor = gdk_cursor_new (GDK_WATCH); -#endif } static gboolean |