summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2007-07-10 15:48:09 +0000
committerGrant Gayed <ggayed>2007-07-10 15:48:09 +0000
commitee543bcb83fee603dbf808a397bfdb1dd9d1075a (patch)
treea1aa553baf59df75b3aa7808883d68f1acbb0ef4 /bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
parentef390566d4164ae7a1f970e53f45de12a5265cf6 (diff)
downloadeclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.tar.gz
eclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.tar.xz
eclipse.platform.swt-ee543bcb83fee603dbf808a397bfdb1dd9d1075a.zip
57151 - [64] 64 bit support needed for Windows XP 64-Bit EditionafterInitialReleaseOfWindows64
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java')
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
index 78a654c6d8..769727fbe2 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
@@ -42,7 +42,7 @@ public class Label extends Control {
Image image;
static final int MARGIN = 4;
static final boolean IMAGE_AND_TEXT = false;
- static final int LabelProc;
+ static final int /*long*/ LabelProc;
static final TCHAR LabelClass = new TCHAR (0, "STATIC", true);
static {
WNDCLASS lpWndClass = new WNDCLASS ();
@@ -91,7 +91,7 @@ public Label (Composite parent, int style) {
super (parent, checkStyle (style));
}
-int callWindowProc (int hwnd, int msg, int wParam, int lParam) {
+int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
if (handle == 0) return 0;
return OS.CallWindowProc (LabelProc, hwnd, msg, wParam, lParam);
}
@@ -136,9 +136,9 @@ public Point computeSize (int wHint, int hHint, boolean changed) {
}
}
if (drawText) {
- int hDC = OS.GetDC (handle);
- int newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
- int oldFont = OS.SelectObject (hDC, newFont);
+ int /*long*/ hDC = OS.GetDC (handle);
+ int /*long*/ newFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
+ int /*long*/ oldFont = OS.SelectObject (hDC, newFont);
int length = OS.GetWindowTextLength (handle);
if (length == 0) {
TEXTMETRIC tm = OS.IsUnicode ? (TEXTMETRIC) new TEXTMETRICW () : new TEXTMETRICA ();
@@ -425,11 +425,11 @@ TCHAR windowClass () {
return LabelClass;
}
-int windowProc () {
+int /*long*/ windowProc () {
return LabelProc;
}
-LRESULT WM_ERASEBKGND (int wParam, int lParam) {
+LRESULT WM_ERASEBKGND (int /*long*/ wParam, int /*long*/ lParam) {
LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
if (result != null) return result;
int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -453,7 +453,7 @@ LRESULT WM_ERASEBKGND (int wParam, int lParam) {
return result;
}
-LRESULT WM_SIZE (int wParam, int lParam) {
+LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
LRESULT result = super.WM_SIZE (wParam, lParam);
if (isDisposed ()) return result;
if ((style & SWT.SEPARATOR) != 0) {
@@ -479,7 +479,7 @@ LRESULT WM_SIZE (int wParam, int lParam) {
return result;
}
-LRESULT WM_UPDATEUISTATE (int wParam, int lParam) {
+LRESULT WM_UPDATEUISTATE (int /*long*/ wParam, int /*long*/ lParam) {
LRESULT result = super.WM_UPDATEUISTATE (wParam, lParam);
/*
* Feature in Windows. When WM_UPDATEUISTATE is sent to
@@ -499,13 +499,13 @@ LRESULT WM_UPDATEUISTATE (int wParam, int lParam) {
}
if (redraw) {
OS.InvalidateRect (handle, null, false);
- int code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
+ int /*long*/ code = OS.DefWindowProc (handle, OS.WM_UPDATEUISTATE, wParam, lParam);
return new LRESULT (code);
}
return result;
}
-LRESULT wmColorChild (int wParam, int lParam) {
+LRESULT wmColorChild (int /*long*/ wParam, int /*long*/ lParam) {
/*
* Bug in Windows. For some reason, the HBRUSH that
* is returned from WM_CTRLCOLOR is misaligned when
@@ -527,7 +527,7 @@ LRESULT wmColorChild (int wParam, int lParam) {
return result;
}
-LRESULT WM_PAINT (int wParam, int lParam) {
+LRESULT WM_PAINT (int /*long*/ wParam, int /*long*/ lParam) {
if (OS.IsWinCE) {
boolean drawImage = image != null;
boolean drawSeparator = (style & SWT.SEPARATOR) != 0 && (style & SWT.SHADOW_NONE) == 0;
@@ -591,7 +591,7 @@ LRESULT WM_PAINT (int wParam, int lParam) {
return super.WM_PAINT(wParam, lParam);
}
-LRESULT wmDrawChild (int wParam, int lParam) {
+LRESULT wmDrawChild (int /*long*/ wParam, int /*long*/ lParam) {
DRAWITEMSTRUCT struct = new DRAWITEMSTRUCT ();
OS.MoveMemory (struct, lParam, DRAWITEMSTRUCT.sizeof);
drawBackground (struct.hDC);