fix for: toolitem's tooltip stop working when toolbar is reparented (no bugzilla entry)

2 files changed, 19 insertions, 1 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
index e4b4967b9d..b68458604b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
@@ -142,6 +142,20 @@ int /*long*/ eventHandle () {
 	return fixedHandle;
 }
 
+void fixChildren (Shell newShell, Shell oldShell, Decorations newDecorations, Decorations oldDecorations, Menu [] menus) {
+	super.fixChildren (newShell, oldShell, newDecorations, oldDecorations, menus);
+	ToolItem [] items = getItems ();
+	if (toolTipText == null) {
+		for (int i = 0; i < items.length; i++) {
+			ToolItem item = items [i];
+			if (item.toolTipText != null) {
+				item.setToolTipText(oldShell, null);
+				item.setToolTipText(newShell, item.toolTipText);
+			}
+		}
+	}
+}
+
 boolean forceFocus (int /*long*/ focusHandle) {
 	if (lastFocus != null && lastFocus.setFocus ()) return true;
 	ToolItem [] items = getItems ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
index 556bf56e34..55f2dece14 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -973,10 +973,14 @@ public void setToolTipText (String string) {
 	toolTipText = string;
 	if (parent.toolTipText == null) {
 		Shell shell = parent._getShell ();
-		shell.setToolTipText (handle, toolTipText);
+		setToolTipText (shell, toolTipText);
 	}
 }
 
+void setToolTipText (Shell shell, String string) {
+	shell.setToolTipText (handle, string);
+}
+
 /**
  * Sets the width of the receiver, for <code>SEPARATOR</code> ToolItems.
  *