--- a/dwt/widgets/ExpandBar.d	Mon Feb 11 00:56:33 2008 +0100
+++ b/dwt/widgets/ExpandBar.d	Mon Feb 11 02:44:32 2008 +0100
@@ -35,6 +35,10 @@
 import dwt.widgets.Event;
 
 import dwt.dwthelper.utils;
+import tango.util.log.Trace;
+void trc( long line ){
+    //Trace.formatln( "ExpandBar {}", line );
+}
 
 /**
  * Instances of this class support the layout of selectable
@@ -131,8 +135,8 @@
     addListener (DWT.Collapse, typedListener);
 }
 
-override LRESULT callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
-    if (handle is null) return LRESULT.ZERO;
+override int callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
+    if (handle is null) return 0;
     return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
 }
 
@@ -585,8 +589,9 @@
 }
 
 override LRESULT WM_KEYDOWN (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_KEYDOWN (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     if (focusItem is null) return result;
     switch (wParam) {
         case OS.VK_SPACE:
@@ -623,12 +628,14 @@
 }
 
 override LRESULT WM_KILLFOCUS (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
     if (focusItem !is null) focusItem.redraw (true);
     return result;
 }
 
 override LRESULT WM_LBUTTONDOWN (int wParam, int lParam) {
+//trc(__LINE__);
     LRESULT result = super.WM_LBUTTONDOWN (wParam, lParam);
     if (result is LRESULT.ZERO) return result;
     int x = cast(short) (lParam & 0xFFFF);
@@ -665,8 +672,9 @@
 }
 
 override LRESULT WM_MOUSELEAVE (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_MOUSELEAVE (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     for (int i = 0; i < itemCount; i++) {
         ExpandItem item = items [i];
         if (item.hover) {
@@ -679,6 +687,7 @@
 }
 
 override LRESULT WM_MOUSEMOVE (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
     if (result is LRESULT.ZERO) return result;
     int x = cast(short) (lParam & 0xFFFF);
@@ -695,6 +704,7 @@
 }
 
 override LRESULT WM_PAINT (int wParam, int lParam) {
+trc(__LINE__);
     PAINTSTRUCT ps;
     GCData data = new GCData ();
     data.ps = &ps;
@@ -724,6 +734,7 @@
 }
 
 override LRESULT WM_PRINTCLIENT (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
     RECT rect;
     OS.GetClientRect (handle, &rect);
@@ -737,8 +748,9 @@
 }
 
 override LRESULT WM_SETCURSOR (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_SETCURSOR (wParam, lParam);
-    if (result !is LRESULT.NULL) return result;
+    if (result !is null) return result;
     int hitTest = lParam & 0xFFFF;
     if (hitTest is OS.HTCLIENT) {
         for (int i = 0; i < itemCount; i++) {
@@ -754,12 +766,14 @@
 }
 
 override LRESULT WM_SETFOCUS (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_SETFOCUS (wParam, lParam);
     if (focusItem !is null) focusItem.redraw (true);
     return result;
 }
 
 override LRESULT WM_SIZE (int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.WM_SIZE (wParam, lParam);
     RECT rect;
     OS.GetClientRect (handle, &rect);
@@ -774,6 +788,7 @@
 }
 
 override LRESULT wmScroll (ScrollBar bar, bool update, HWND hwnd, int msg, int wParam, int lParam) {
+trc(__LINE__);
     LRESULT result = super.wmScroll (bar, true, hwnd, msg, wParam, lParam);
     SCROLLINFO info;
     info.cbSize = SCROLLINFO.sizeof;