Mercurial > projects > dwt-win
changeset 236:9c1bb90eba13
merge
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Sun, 08 Jun 2008 15:12:40 +0200 |
parents | ec7da638647f (diff) 51a84342d244 (current diff) |
children | e2affbeb686d |
files | |
diffstat | 2 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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 ){
--- 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);