# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1212930760 -7200
# Node ID 9c1bb90eba13b84a62466d8abed5d22531977405
# Parent  ec7da638647fd473c29d9b2cab39556a01b3f4d1# Parent  51a84342d2448c11e4c3e2e023491f853b8d8f0c
merge

diff -r 51a84342d244 -r 9c1bb90eba13 dwt/dwthelper/utils.d
--- a/dwt/dwthelper/utils.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/dwthelper/utils.d	Sun Jun 08 15:12:40 2008 +0200
@@ -591,10 +591,10 @@
 }
 
 public int compareToIgnoreCase( String src, String other ){
-    return tango.text.Unicode.toFold(src) < tango.text.Unicode.toFold(other);
+    return compareTo( tango.text.Unicode.toFold(src), tango.text.Unicode.toFold(other));
 }
 public int compareTo( String src, String other ){
-    return src < other;
+    return typeid(String).compare( cast(void*)&src, cast(void*)&other );
 }
 
 public bool startsWith( String src, String pattern ){
diff -r 51a84342d244 -r 9c1bb90eba13 dwt/widgets/Widget.d
--- a/dwt/widgets/Widget.d	Tue Jun 03 23:19:30 2008 +0200
+++ b/dwt/widgets/Widget.d	Sun Jun 08 15:12:40 2008 +0200
@@ -1939,10 +1939,8 @@
 LRESULT wmLButtonUp (HWND hwnd, int wParam, int lParam) {
     Display display = this.display;
     LRESULT result = null;
-trc(__LINE__);
     if (sendMouseEvent (DWT.MouseUp, 1, hwnd, OS.WM_LBUTTONUP, wParam, lParam)) {
-trc(__LINE__);
-        result = new LRESULT( callWindowProc (hwnd, OS.WM_LBUTTONUP, wParam, lParam));
+        result = new LRESULT (callWindowProc (hwnd, OS.WM_LBUTTONUP, wParam, lParam));
     } else {
         result = LRESULT.ZERO;
     }
@@ -1979,7 +1977,7 @@
     display.captureChanged = false;
     sendMouseEvent (DWT.MouseDown, 2, hwnd, OS.WM_MBUTTONDOWN, wParam, lParam);
     if (sendMouseEvent (DWT.MouseDoubleClick, 2, hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam)) {
-        result = new LRESULT( callWindowProc (hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam));
+        result = new LRESULT (callWindowProc (hwnd, OS.WM_MBUTTONDBLCLK, wParam, lParam));
     } else {
         result = LRESULT.ZERO;
     }
@@ -1994,7 +1992,7 @@
     Display display = this.display;
     display.captureChanged = false;
     if (sendMouseEvent (DWT.MouseDown, 2, hwnd, OS.WM_MBUTTONDOWN, wParam, lParam)) {
-        result = new LRESULT( callWindowProc (hwnd, OS.WM_MBUTTONDOWN, wParam, lParam));
+        result = new LRESULT (callWindowProc (hwnd, OS.WM_MBUTTONDOWN, wParam, lParam));
     } else {
         result = LRESULT.ZERO;
     }
@@ -2008,7 +2006,7 @@
     Display display = this.display;
     LRESULT result = null;
     if (sendMouseEvent (DWT.MouseUp, 2, hwnd, OS.WM_MBUTTONUP, wParam, lParam)) {
-        result = new LRESULT( callWindowProc (hwnd, OS.WM_MBUTTONUP, wParam, lParam));
+        result = new LRESULT (callWindowProc (hwnd, OS.WM_MBUTTONUP, wParam, lParam));
     } else {
         result = LRESULT.ZERO;
     }
@@ -2285,7 +2283,7 @@
     Display display = this.display;
     LRESULT result = null;
     if (sendMouseEvent (DWT.MouseUp, 3, hwnd, OS.WM_RBUTTONUP, wParam, lParam)) {
-        result = new LRESULT( callWindowProc (hwnd, OS.WM_RBUTTONUP, wParam, lParam));
+        result = new LRESULT (callWindowProc (hwnd, OS.WM_RBUTTONUP, wParam, lParam));
     } else {
         /* Call the DefWindowProc() to support WM_CONTEXTMENU */
         OS.DefWindowProc (hwnd, OS.WM_RBUTTONUP, wParam, lParam);