Bug 571033 - [GTK] Clean up ToolTips Implementation - Removing oldToolTip text
check
- This check is unnecessary as setting the gtk_widget_set_tooltip_text
to the same text again doesn't make it less efficient than doing a
strcmp
- Removed setTooltipText(long, long, String) since the second parameter
"tipWidget" is never used
Change-Id: I1f0ed36c86901fda7430a182b0eec58a87f83929
Signed-off-by: Paul D'Pong <sdamrong@redhat.com>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
index 330b5f1..a6522c7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
@@ -6016,7 +6016,7 @@
* under the pointer).
*/
if (display.currentControl == this) {
- shell.setToolTipText (shell.handle, eventHandle (), newString);
+ shell.setToolTipText(shell.handle, newString);
}
}
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 7650a37..da8828f 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
@@ -3423,28 +3423,16 @@
}
}
-void setToolTipText (long tipWidget, String string) {
- setToolTipText (tipWidget, tipWidget, string);
+void setToolTipText(long tipWidget, String string) {
+ byte[] buffer = null;
+ if (string != null && !string.isEmpty()) {
+ char[] chars = fixMnemonic(string, false, true);
+ buffer = Converter.wcsToMbcs(chars, true);
+ }
+
+ GTK.gtk_widget_set_tooltip_text(tipWidget, buffer);
}
-void setToolTipText (long rootWidget, long tipWidget, String string) {
- byte [] buffer = null;
- if (string != null && string.length () > 0) {
- char [] chars = fixMnemonic (string, false, true);
- buffer = Converter.wcsToMbcs (chars, true);
- }
- long oldTooltip = GTK.gtk_widget_get_tooltip_text (rootWidget);
- boolean same = false;
- if (buffer == null && oldTooltip == 0) {
- same = true;
- } else if (buffer != null && oldTooltip != 0) {
- same = OS.strcmp (oldTooltip, buffer) == 0;
- }
- if (oldTooltip != 0) OS.g_free(oldTooltip);
- if (same) return;
-
- GTK.gtk_widget_set_tooltip_text (rootWidget, buffer);
-}
@Override
Point getWindowOrigin () {
if (!mapped) {
