summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorArun Thondapu2012-03-28 17:50:17 (EDT)
committer Bogdan Gheorghe2012-04-26 17:00:11 (EDT)
commit5ce98d84a4c0affe3f610dd38f75dacaa39a48fc (patch)
tree96115064bc268acd7e9d79661297aa5fd3527528
parent787093e736756adf2ce791103e7e4e3ae474e60e (diff)
downloadeclipse.platform.swt-5ce98d84a4c0affe3f610dd38f75dacaa39a48fc.zip
eclipse.platform.swt-5ce98d84a4c0affe3f610dd38f75dacaa39a48fc.tar.gz
eclipse.platform.swt-5ce98d84a4c0affe3f610dd38f75dacaa39a48fc.tar.bz2
Bug 46025 - [Widgets] Toolbar does not support WRAP style (comment#71)
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java6
1 files changed, 1 insertions, 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 296fb75..e398ddb 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);
}