Bug 170785 - Table Headers getting random images on Vista when cycling through sort indicator (3.2 Maintenance Stream)

2 files changed, 3 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
index 2596ff475e..b53330ef0c 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -1459,8 +1459,8 @@ void destroyItem (TableColumn column) {
 			if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
 			if (OS.COMCTL32_MAJOR >= 6) {
 				HDITEM hdItem = new HDITEM ();
-				hdItem.mask = OS.HDI_FORMAT | OS.HDI_IMAGE;
-				hdItem.fmt &= ~(OS.HDF_SORTUP | OS.HDF_SORTDOWN | OS.HDF_IMAGE);
+				hdItem.mask = OS.HDI_FORMAT;
+				hdItem.fmt = OS.HDF_LEFT;
 				int hwndHeader = OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
 				OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
index f40628fdf7..e0164d76d6 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
@@ -692,6 +692,7 @@ void setSortDirection (int direction) {
 					hdItem.iImage = parent.imageIndexHeader (image);
 				} else {
 					hdItem.fmt &= ~OS.HDF_IMAGE;
+					hdItem.mask &= ~OS.HDI_IMAGE;
 				}
 				break;
 		}