Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover2006-12-05 17:18:48 -0500
committerSteve Northover2006-12-05 17:18:48 -0500
commit6369ca46b4481c9782d21beec2607317ea01ba6e (patch)
tree0417808635aed0bec3f937118d96c20f2b58dc4e
parent7881dff9ccb68b161f1ec9e709b668f188b0753c (diff)
downloadeclipse.platform.swt-6369ca46b4481c9782d21beec2607317ea01ba6e.tar.gz
eclipse.platform.swt-6369ca46b4481c9782d21beec2607317ea01ba6e.tar.xz
eclipse.platform.swt-6369ca46b4481c9782d21beec2607317ea01ba6e.zip
158982 - Table Headers getting random images on Vista
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java5
2 files changed, 4 insertions, 2 deletions
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 abb046b528..ccf751fd19 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
@@ -621,6 +621,7 @@ void setImage (Image image, boolean sort, boolean right) {
lvColumn.iImage = parent.imageIndexHeader (image);
if (right) lvColumn.fmt |= OS.LVCFMT_BITMAP_ON_RIGHT;
} else {
+ lvColumn.mask &= ~OS.LVCF_IMAGE;
lvColumn.fmt &= ~(OS.LVCFMT_IMAGE | OS.LVCFMT_BITMAP_ON_RIGHT);
}
OS.SendMessage (hwnd, OS.LVM_SETCOLUMN, index, lvColumn);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
index 0b3a2262ab..f8267480fc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java
@@ -543,8 +543,9 @@ void setImage (Image image, boolean sort, boolean right) {
}
if (right) hdItem.fmt |= OS.HDF_BITMAP_ON_RIGHT;
} else {
- hdItem.fmt &= ~(OS.HDF_IMAGE | OS.HDF_BITMAP);
- }
+ hdItem.mask &= ~(OS.HDI_IMAGE | OS.HDI_BITMAP);
+ hdItem.fmt &= ~(OS.HDF_IMAGE | OS.HDF_BITMAP);
+ }
OS.SendMessage (hwndHeader, OS.HDM_SETITEM, index, hdItem);
}

Back to the top