diff options
author | Alexander Kurtakov <akurtako@redhat.com> | 2011-12-13 23:30:44 +0200 |
---|---|---|
committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-01-20 11:43:50 -0500 |
commit | 78500020090976af077471b3e341f6d07a0b37f2 (patch) | |
tree | 65a18585a466d555d272034a82990a2ab6ea5da3 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse | |
parent | 75c274e4fa1923159023dd9bdcdf3ac07cf46332 (diff) | |
download | eclipse.platform.swt-78500020090976af077471b3e341f6d07a0b37f2.tar.gz eclipse.platform.swt-78500020090976af077471b3e341f6d07a0b37f2.tar.xz eclipse.platform.swt-78500020090976af077471b3e341f6d07a0b37f2.zip |
Make gtk_tooltips_enable/disable dynamic.
Both calls were guarded by if tooltipsHandle !=0 and tooltiopsHandle is
created only for gtk versions lower than 2.12 that's why the guard has
been expanded to be (tooltipsHandle != 0 && GTK_vrsion < 2.12).
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index f7ee4f287a..1ace883cd5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -725,7 +725,9 @@ int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long* case OS.NotifyNonlinear: case OS.NotifyNonlinearVirtual: case OS.NotifyAncestor: - if (tooltipsHandle != 0) OS.gtk_tooltips_enable (tooltipsHandle); + if (tooltipsHandle != 0 && OS.GTK_VERSION < OS.VERSION (2, 12, 0)) { + OS.gtk_tooltips_enable (tooltipsHandle); + } display.activeShell = this; display.activePending = false; sendEvent (SWT.Activate); @@ -743,7 +745,9 @@ int /*long*/ filterProc (int /*long*/ xEvent, int /*long*/ gdkEvent, int /*long* case OS.NotifyNonlinear: case OS.NotifyNonlinearVirtual: case OS.NotifyVirtual: - if (tooltipsHandle != 0) OS.gtk_tooltips_disable (tooltipsHandle); + if (tooltipsHandle != 0 && OS.GTK_VERSION < OS.VERSION (2, 12, 0)) { + OS.gtk_tooltips_disable (tooltipsHandle); + } Display display = this.display; sendEvent (SWT.Deactivate); setActiveControl (null); |