diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-11-06 16:19:05 +0200 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2012-11-06 16:19:05 +0200 |
| commit | dcf63a1ba6c346121e757780d77e92fb9c9886c3 (patch) | |
| tree | 8cda37ededf179d9c8cee07cf238b9544fc27936 | |
| parent | 41219db807d6f3850e60dc8bc3143eb0dbf4e594 (diff) | |
| download | eclipse.platform.swt-dcf63a1ba6c346121e757780d77e92fb9c9886c3.tar.gz eclipse.platform.swt-dcf63a1ba6c346121e757780d77e92fb9c9886c3.tar.xz eclipse.platform.swt-dcf63a1ba6c346121e757780d77e92fb9c9886c3.zip | |
Remove pre Gtk 2.6 conditionals.
Gtk prior to version 2.6 are no longer supported so let's clean our code
a bit.
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java index df50ad6b72..2106ac5c10 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/ClipboardProxy.java @@ -89,18 +89,10 @@ long /*int*/ clearFunc(long /*int*/ clipboard,long /*int*/ user_data_or_owner){ void dispose () { if (display == null) return; if (activeClipboard != null) { - if (OS.GTK_VERSION >= OS.VERSION(2, 6, 0)) { - OS.gtk_clipboard_store(Clipboard.GTKCLIPBOARD); - } else { - OS.gtk_clipboard_clear(Clipboard.GTKCLIPBOARD); - } + OS.gtk_clipboard_store(Clipboard.GTKCLIPBOARD); } if (activePrimaryClipboard != null) { - if (OS.GTK_VERSION >= OS.VERSION(2, 6, 0)) { - OS.gtk_clipboard_store(Clipboard.GTKPRIMARYCLIPBOARD); - } else { - OS.gtk_clipboard_clear(Clipboard.GTKPRIMARYCLIPBOARD); - } + OS.gtk_clipboard_store(Clipboard.GTKPRIMARYCLIPBOARD); } display = null; if (getFunc != null ) getFunc.dispose(); @@ -196,9 +188,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) { return false; } - if (OS.GTK_VERSION >= OS.VERSION(2, 6, 0)) { - OS.gtk_clipboard_set_can_store(Clipboard.GTKCLIPBOARD, 0, 0); - } + OS.gtk_clipboard_set_can_store(Clipboard.GTKCLIPBOARD, 0, 0); activeClipboard = owner; } if ((clipboards & DND.SELECTION_CLIPBOARD) != 0) { @@ -209,9 +199,7 @@ boolean setData(Clipboard owner, Object[] data, Transfer[] dataTypes, int clipbo if (!OS.gtk_clipboard_set_with_owner (Clipboard.GTKPRIMARYCLIPBOARD, pTargetsList, entries.length, getFuncProc, clearFuncProc, clipboardOwner)) { return false; } - if (OS.GTK_VERSION >= OS.VERSION(2, 6, 0)) { - OS.gtk_clipboard_set_can_store(Clipboard.GTKPRIMARYCLIPBOARD, 0, 0); - } + OS.gtk_clipboard_set_can_store(Clipboard.GTKPRIMARYCLIPBOARD, 0, 0); activePrimaryClipboard = owner; } return true; |