--- a/dwt/widgets/Link.d	Mon Feb 11 00:56:33 2008 +0100
+++ b/dwt/widgets/Link.d	Mon Feb 11 02:44:32 2008 +0100
@@ -163,10 +163,10 @@
     addListener (DWT.DefaultSelection, typedListener);
 }
 
-override LRESULT callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
-    if (handle is null) return LRESULT.NULL;
-    if (LinkProc !is null) return cast(LRESULT) OS.CallWindowProc (LinkProc, hwnd, msg, wParam, lParam);
-    return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
+override int callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
+    if (handle is null) return 0;
+    if (LinkProc !is null) return OS.CallWindowProc (LinkProc, hwnd, msg, wParam, lParam);
+    return OS.DefWindowProc (hwnd, msg, wParam, lParam);
 }
 
 override public Point computeSize (int wHint, int hHint, bool changed) {
@@ -673,7 +673,7 @@
 
 override LRESULT WM_CHAR (int wParam, int lParam) {
     LRESULT result = super.WM_CHAR (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     if (OS.COMCTL32_MAJOR < 6) {
         if (focusIndex is -1) return result;
         switch (wParam) {
@@ -711,7 +711,7 @@
                 * performed in WM_KEYDOWN from WM_CHAR.
                 */
                 int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
-                return cast(LRESULT) (code);
+                return new LRESULT (code);
             default:
         }
 
@@ -721,7 +721,7 @@
 
 override LRESULT WM_GETDLGCODE (int wParam, int lParam) {
     LRESULT result = super.WM_GETDLGCODE (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     int index, count, code = 0;
     if (OS.COMCTL32_MAJOR >= 6) {
         LITEM item;
@@ -741,30 +741,30 @@
         count = offsets.length;
     }
     if (count is 0) {
-        return cast(LRESULT) (code | OS.DLGC_STATIC);
+        return new LRESULT (code | OS.DLGC_STATIC);
     }
     bool next = OS.GetKeyState (OS.VK_SHIFT) >= 0;
     if (next && index < count - 1) {
-        return cast(LRESULT) (code | OS.DLGC_WANTTAB);
+        return new LRESULT (code | OS.DLGC_WANTTAB);
     }
     if (!next && index > 0) {
-        return cast(LRESULT) (code | OS.DLGC_WANTTAB);
+        return new LRESULT (code | OS.DLGC_WANTTAB);
     }
     return result;
 }
 
 override LRESULT WM_GETFONT (int wParam, int lParam) {
     LRESULT result = super.WM_GETFONT (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     int code = callWindowProc (handle, OS.WM_GETFONT, wParam, lParam);
-    if (code !is 0) return cast(LRESULT) (code);
+    if (code !is 0) return new LRESULT (code);
     if (font is null) font = defaultFont ();
-    return cast(LRESULT) (font);
+    return new LRESULT ( cast(int) font);
 }
 
 override LRESULT WM_KEYDOWN (int wParam, int lParam) {
     LRESULT result = super.WM_KEYDOWN (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     if (OS.COMCTL32_MAJOR >= 6) {
         switch (wParam) {
             case OS.VK_SPACE:
@@ -957,11 +957,11 @@
     if (OS.COMCTL32_MAJOR >= 6) {
         if (!OS.IsWindowEnabled (handle)) {
             OS.SetTextColor (cast(HANDLE)wParam, OS.GetSysColor (OS.COLOR_GRAYTEXT));
-            if (result is LRESULT.NULL) {
+            if (result is null) {
                 int backPixel = getBackgroundPixel ();
                 OS.SetBkColor (cast(HANDLE)wParam, backPixel);
                 auto hBrush = findBrush (backPixel, OS.BS_SOLID);
-                return cast(LRESULT) (hBrush);
+                return new LRESULT ( cast(int) hBrush);
             }
         }
     }
@@ -982,7 +982,7 @@
             default:
         }
     }
-    return cast(LRESULT) super.wmNotifyChild (hdr, wParam, lParam);
+    return super.wmNotifyChild (hdr, wParam, lParam);
 }
 }