diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-08-15 15:00:37 -0400 |
|---|---|---|
| committer | Anatoly Spektor <aspektor@redhat.com> | 2012-08-15 15:00:37 -0400 |
| commit | f9b1702d538b7119b88c12bc0de93297d0f1bfff (patch) | |
| tree | 84de82d41d6f934fe5bb1bd1b08027ee573a93ce /bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java | |
| parent | 390e16e87916237b4b4a491c6ddf80f8de406bfc (diff) | |
| parent | a104ef04f5c11c447be0b7779b1621be8be740f1 (diff) | |
| download | eclipse.platform.swt-f9b1702d538b7119b88c12bc0de93297d0f1bfff.tar.gz eclipse.platform.swt-f9b1702d538b7119b88c12bc0de93297d0f1bfff.tar.xz eclipse.platform.swt-f9b1702d538b7119b88c12bc0de93297d0f1bfff.zip | |
Merge branch 'master' of http://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java index 78e4cd1b58..5be5ddad9a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -110,7 +110,11 @@ public class TreeDragSourceEffect extends DragSourceEffect { int /*long*/ path = OS.g_list_nth_data (list, i); OS.gtk_tree_view_get_cell_area (handle, path, 0, rect); pixmaps[i] = OS.gtk_tree_view_create_row_drag_icon(handle, path); - OS.gdk_drawable_get_size(pixmaps[i], w, h); + if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) { + OS.gdk_pixmap_get_size(pixmaps[i], w, h); + } else { + OS.gdk_drawable_get_size(pixmaps[i], w, h); + } width = Math.max(width, w[0]); height = rect.y + h[0] - yy[0]; yy[i] = rect.y; |