From 5ce98d84a4c0affe3f610dd38f75dacaa39a48fc Mon Sep 17 00:00:00 2001
From: Arun Thondapu
Date: Wed, 28 Mar 2012 17:50:17 -0400
Subject: Bug 46025 - [Widgets] Toolbar does not support WRAP style
 (comment#71)

---
 .../Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java           | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 296fb75d89..e398ddbb64 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	
@@ -581,7 +581,7 @@ int /*long*/ gtk_create_menu_proxy (int /*long*/ widget) {
 	 * activate signal to send the Arrow selection signal. 
 	 */
 	if ((style & SWT.DROP_DOWN) != 0) return 0;
-	if (image != null /*&& (text == null || text.length() == 0)*/) {
+	if (image != null) {
 		ImageList imageList = parent.imageList;
 		if (imageList != null) {
 			int index = imageList.indexOf (image);
@@ -948,10 +948,6 @@ void setFontDescription (int /*long*/ font) {
 }
 
 void setForegroundColor (GdkColor color) {
-	int /*long*/ childHandle = OS.gtk_bin_get_child(handle);
-	if (childHandle != 0) {
-	    setForegroundColor (childHandle, color);
-	}
 	if (labelHandle != 0) setForegroundColor (labelHandle, color);
 }
 
-- 
cgit v1.2.3