From 06e82a3155386507e1f8e02769d1f3451bc7d755 Mon Sep 17 00:00:00 2001
From: Carolyn MacLeod <carolyn>
Date: Wed, 30 May 2007 18:39:22 +0000
Subject: use NONE instead of NULL to test sortDirection (consistent with
 javadoc)

---
 .../Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java        | 4 ++--
 .../Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'bundles')

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);
 	}
 }
-- 
cgit