diff options
| author | Carolyn MacLeod <carolyn> | 2007-05-30 18:39:22 +0000 |
|---|---|---|
| committer | Carolyn MacLeod <carolyn> | 2007-05-30 18:39:22 +0000 |
| commit | 06e82a3155386507e1f8e02769d1f3451bc7d755 (patch) | |
| tree | 2e7fc381df10f003907518fa0344b31d69d496a7 /bundles | |
| parent | 28850b68ad93f11a072a66b97a678a17aac0c282 (diff) | |
| download | eclipse.platform.swt-06e82a3155386507e1f8e02769d1f3451bc7d755.tar.gz eclipse.platform.swt-06e82a3155386507e1f8e02769d1f3451bc7d755.tar.xz eclipse.platform.swt-06e82a3155386507e1f8e02769d1f3451bc7d755.zip | |
use NONE instead of NULL to test sortDirection (consistent with javadoc)
Diffstat (limited to 'bundles')
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java | 4 |
2 files changed, 4 insertions, 4 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 b6424de130..0d0b6bd9bb 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 @@ -329,7 +329,7 @@ public void pack () { if (image != null || parent.sortColumn == this) { hasHeaderImage = true; Image headerImage = null; - if (parent.sortColumn == this && parent.sortDirection != SWT.NULL) { + if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) { if (OS.COMCTL32_MAJOR < 6) { headerImage = display.getSortImage (parent.sortDirection); } else { @@ -580,7 +580,7 @@ public void setImage (Image image) { error (SWT.ERROR_INVALID_ARGUMENT); } super.setImage (image); - if (parent.sortColumn != this || parent.sortDirection != SWT.NULL) { + if (parent.sortColumn != this || parent.sortDirection != SWT.NONE) { setImage (image, false, false); } } 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 4dae7c2e68..2e3f0a12e1 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 @@ -380,7 +380,7 @@ public void pack () { if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) headerWidth += Tree.HEADER_EXTRA; if (image != null || parent.sortColumn == this) { Image headerImage = null; - if (parent.sortColumn == this && parent.sortDirection != SWT.NULL) { + if (parent.sortColumn == this && parent.sortDirection != SWT.NONE) { if (OS.COMCTL32_MAJOR < 6) { headerImage = display.getSortImage (parent.sortDirection); } else { @@ -516,7 +516,7 @@ public void setImage (Image image) { error (SWT.ERROR_INVALID_ARGUMENT); } super.setImage (image); - if (parent.sortColumn != this || parent.sortDirection != SWT.NULL) { + if (parent.sortColumn != this || parent.sortDirection != SWT.NONE) { setImage (image, false, false); } } |