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

1 files changed, 13 insertions, 13 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
index 75fcf1d5d4..bf156e1862 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
@@ -114,16 +114,16 @@ static ExpandBar checkNull (ExpandBar control) {
 	return control;	
 }
 
-private void drawChevron (int hDC, RECT rect) {
-	int oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
+private void drawChevron (int /*long*/ hDC, RECT rect) {
+	int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
 	OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
 	OS.SelectObject (hDC, oldBrush);
 	rect.left += 4;
 	rect.top += 4;
 	rect.right -= 4;
 	rect.bottom -= 4;
-	int hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.foreground);
-	int oldPen = OS.SelectObject (hDC, hPen);
+	int /*long*/ hPen = OS.CreatePen (OS.PS_SOLID, 1, parent.foreground);
+	int /*long*/ oldPen = OS.SelectObject (hDC, hPen);
 	int [] polyline1, polyline2;
 	if (expanded) {
 		int px = rect.left + 5;
@@ -149,8 +149,8 @@ private void drawChevron (int hDC, RECT rect) {
 	OS.Polyline (hDC, polyline1, polyline1.length / 2);
 	OS.Polyline (hDC, polyline2, polyline2.length / 2);
 	if (hover) {
-		int whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT));
-		int darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW));
+		int /*long*/ whitePen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DHILIGHT));
+		int /*long*/ darkGrayPen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_3DSHADOW));
 		OS.SelectObject (hDC, whitePen);
 		int [] points1 = {
 				rect.left, rect.bottom,
@@ -172,15 +172,15 @@ private void drawChevron (int hDC, RECT rect) {
 	OS.DeleteObject (hPen);
 }
 
-void drawItem (GC gc, int hTheme, RECT clipRect, boolean drawFocus) {
-	int hDC = gc.handle;
+void drawItem (GC gc, int /*long*/ hTheme, RECT clipRect, boolean drawFocus) {
+	int /*long*/ hDC = gc.handle;
 	int headerHeight = parent.getBandHeight ();
 	RECT rect = new RECT ();
 	OS.SetRect (rect, x, y, x + width, y + headerHeight);
 	if (hTheme != 0) {
 		OS.DrawThemeBackground (hTheme, hDC, OS.EBP_NORMALGROUPHEAD, 0, rect, clipRect);
 	} else {
-		int oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
+		int /*long*/ oldBrush = OS.SelectObject (hDC, OS.GetSysColorBrush (OS.COLOR_BTNFACE));
 		OS.PatBlt (hDC, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, OS.PATCOPY);
 		OS.SelectObject (hDC, oldBrush);		
 	}
@@ -221,8 +221,8 @@ void drawItem (GC gc, int hTheme, RECT clipRect, boolean drawFocus) {
 	}
 	if (expanded) {
 		if (!parent.isAppThemed ()) {
-			int pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE));
-			int oldPen = OS.SelectObject (hDC, pen);
+			int /*long*/ pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE));
+			int /*long*/ oldPen = OS.SelectObject (hDC, pen);
 			int [] points = {
 					x, y + headerHeight, 
 					x, y + headerHeight + height, 
@@ -317,7 +317,7 @@ public ExpandBar getParent () {
 	return parent;
 }
 
-int getPreferredWidth (int hTheme, int hDC) {
+int getPreferredWidth (int /*long*/ hTheme, int /*long*/ hDC) {
 	int width = ExpandItem.TEXT_INSET * 2 + ExpandItem.CHEVRON_SIZE;
 	if (image != null) {
 		width += ExpandItem.TEXT_INSET + imageWidth;
@@ -341,7 +341,7 @@ boolean isHover (int x, int y) {
 }
 
 void redraw (boolean all) {
-	int parentHandle = parent.handle;
+	int /*long*/ parentHandle = parent.handle;
 	int headerHeight = parent.getBandHeight ();
 	RECT rect = new RECT ();
 	int left = all ? x : x + width - headerHeight;