57151 - [64] 64 bit support needed for Windows XP 64-Bit EditionafterInitialReleaseOfWindows64

11 files changed, 22 insertions, 22 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
index 57ba4afaef..a6a533701b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
@@ -57,7 +57,7 @@ int[] getPartId(int part) {
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 		//TODO - arrow and toggle
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = bounds.x + bounds.width;
@@ -90,7 +90,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
 int hit(Theme theme, Point position, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
 	if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
-	int hTheme = OS.OpenThemeData(0, getClassId());
+	int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 	RECT rect = new RECT ();
 	rect.left = bounds.x;
 	rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
index e968fd6b6b..053395c5a7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ComboDrawData.java
@@ -21,7 +21,7 @@ public ComboDrawData() {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, EDIT);
+		int /*long*/ hTheme = OS.OpenThemeData(0, EDIT);
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = bounds.x + bounds.width;
@@ -81,7 +81,7 @@ int[] getPartId(int part) {
 int hit(Theme theme, Point position, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
 	if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
-	int hTheme = OS.OpenThemeData(0, EDIT);
+	int /*long*/ hTheme = OS.OpenThemeData(0, EDIT);
 	int[] part = getPartId(DrawData.WIDGET_WHOLE);
 	int iPartId = part[0];
 	int iStateId = part[1];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
index 975dd22b0b..ee1b7a6c95 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/DrawData.java
@@ -89,7 +89,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
 
 void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-//		int hTheme = OS.OpenThemeData(0, getClassId());
+//		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 //		RECT rect = new RECT ();
 //		rect.left = bounds.x;
 //		rect.right = bounds.x + bounds.width;
@@ -109,7 +109,7 @@ void drawImage(Theme theme, Image image, GC gc, Rectangle bounds) {
 
 void drawText(Theme theme, String text, int flags, GC gc, Rectangle bounds) { 
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		char[] chars = new char[text.length()];
 		text.getChars(0, chars.length, chars, 0);
 		int textFlags = OS.DT_SINGLELINE;
@@ -150,7 +150,7 @@ int hit(Theme theme, Point position, Rectangle bounds) {
 
 Rectangle measureText(Theme theme, String text, int flags, GC gc, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return new Rectangle(0, 0, 0, 0);
-	int hTheme = OS.OpenThemeData(0, getClassId());
+	int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 	char[] chars = new char[text.length()];
 	text.getChars(0, chars.length, chars, 0);
 	//TODO - constant for VCENTER and flags
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
index 057bc42745..e4f8e0368d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ExpanderDrawData.java
@@ -22,7 +22,7 @@ public ExpanderDrawData() {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		int iStateId = OS.GLPS_CLOSED;
 		if ((this.style & SWT.DOWN) != 0) iStateId = OS.GLPS_OPENED;
 		SIZE size = new SIZE();
@@ -51,7 +51,7 @@ int[] getPartId(int part) {
 int hit(Theme theme, Point position, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
 	if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
-	int hTheme = OS.OpenThemeData(0, getClassId());
+	int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 	SIZE size = new SIZE();
 	int[] part = getPartId(DrawData.WIDGET_WHOLE);
 	OS.GetThemePartSize(hTheme, 0, part[0], part[1], null, OS.TS_TRUE, size);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
index 31b7460001..83ceb60da7 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/GroupDrawData.java
@@ -26,7 +26,7 @@ static final int GROUP_HEADER_X = 9;
 static final int GROUP_HEADER_PAD = 2;
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
index 857500d4ae..cb3304597a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ProgressBarDrawData.java
@@ -22,7 +22,7 @@ public ProgressBarDrawData() {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = rect.left + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
index 15156c4082..594f3092c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScaleDrawData.java
@@ -32,7 +32,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
 		int maximum = this.maximum;
 		int selection = this.selection;
 		int pageIncrement = this.pageIncrement;
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = rect.left + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
index 713d8dc4c3..0bc7978864 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ScrollBarDrawData.java
@@ -25,7 +25,7 @@ public ScrollBarDrawData() {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		if ((style & SWT.VERTICAL) != 0) {
 			int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);
@@ -159,7 +159,7 @@ int[] getPartId(int part) {
 
 Rectangle getBounds(int part, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		if ((style & SWT.VERTICAL) != 0) {
 			int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);
 			int totalWidth = bounds.height - 2 * width;
@@ -187,7 +187,7 @@ Rectangle getBounds(int part, Rectangle bounds) {
 
 int getSelection(Point position, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		if ((style & SWT.VERTICAL) != 0) {
 			int width = OS.GetThemeSysSize(hTheme, OS.SM_CXVSCROLL);			
 			int totalWidth = bounds.height - 2 * width;
@@ -205,7 +205,7 @@ int getSelection(Point position, Rectangle bounds) {
 
 int hit(Theme theme, Point position, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return -1;
-	int hTheme = OS.OpenThemeData(0, getClassId());
+	int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 	//TODO - should we take a GC?
 	int hDC = 0;
 	RECT rect = new RECT ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
index e59e7111c6..e152c16504 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabFolderDrawData.java
@@ -31,7 +31,7 @@ public TabFolderDrawData() {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = bounds.x + bounds.width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
index 589c15f198..2b42d77ec3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/TabItemDrawData.java
@@ -28,7 +28,7 @@ public TabItemDrawData() {
 
 Rectangle computeTrim(Theme theme, GC gc) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		int x = clientArea.x, y = clientArea.y, width = clientArea.width, height = clientArea.height;
 		if ((style & SWT.LEFT) != 0) {
 			x -= TABITEM_INSET;
@@ -56,7 +56,7 @@ Rectangle computeTrim(Theme theme, GC gc) {
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 		int state = this.state[DrawData.WIDGET_WHOLE];
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
 		if ((position & SWT.LEFT) != 0) {
 			x += TABITEM_INSET;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
index 7124c12871..2c0cff8d66 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
@@ -26,7 +26,7 @@ public ToolItemDrawData() {
 
 Rectangle computeTrim(Theme theme, GC gc) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = clientArea.x;
 		rect.right = clientArea.x + clientArea.width;
@@ -54,7 +54,7 @@ Rectangle computeTrim(Theme theme, GC gc) {
 
 void draw(Theme theme, GC gc, Rectangle bounds) {
 	if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
-		int hTheme = OS.OpenThemeData(0, getClassId());
+		int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 		RECT rect = new RECT ();
 		rect.left = bounds.x;
 		rect.right = bounds.x + bounds.width;
@@ -137,7 +137,7 @@ int[] getPartId(int part) {
 int hit(Theme theme, Point position, Rectangle bounds) {
 	if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
 	if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
-	int hTheme = OS.OpenThemeData(0, getClassId());
+	int /*long*/ hTheme = OS.OpenThemeData(0, getClassId());
 	try {
 		RECT rect = new RECT ();
 		rect.left = bounds.x;