138907 - Cheese in Tree with text that spans columns
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
index cfe7a15..9c86192 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -5683,7 +5683,7 @@
 						OS.SendMessage (hwndHeader, OS.HDM_GETITEMRECT, phdn.iItem, headerRect);
 						int gridWidth = getLinesVisible () ? GRID_WIDTH : 0;
 						rect.left = headerRect.right - gridWidth;
-						if (findImageControl () != null) {
+						if (findImageControl () != null || hooks (SWT.EraseItem) || hooks (SWT.PaintItem)) {
 							OS.InvalidateRect (handle, rect, true);
 						} else {
 							HDITEM oldItem = new HDITEM ();