projects/dwt-win: dwt/widgets/Tree.d comparison

comparison dwt/widgets/Tree.d @ 108:6f75fdfa1bcd

Change LRESULT to class, like done in the old DWT.

author	Frank Benoit <benoit@tionex.de>
date	Mon, 11 Feb 2008 02:44:32 +0100
parents	43c42c637c9c
children	f353be82b6be

comparison

equal deleted inserted replaced

-:e4a62cdcd2e0
+:6f75fdfa1bcd
 override HWND borderHandle () {
 return hwndParent !is null ? hwndParent : handle;
 }
 LRESULT CDDS_ITEMPOSTPAINT (NMTVCUSTOMDRAW* nmcd, int wParam, int lParam) {
-if (ignoreCustomDraw) return LRESULT.NULL;
+if (ignoreCustomDraw) return null;
-if (nmcd.nmcd.rc.left is nmcd.nmcd.rc.right) return cast(LRESULT) (OS.CDRF_DODEFAULT);
+if (nmcd.nmcd.rc.left is nmcd.nmcd.rc.right) return new LRESULT (OS.CDRF_DODEFAULT);
 auto hDC = nmcd.nmcd.hdc;
 OS.RestoreDC (hDC, -1);
 TreeItem item = getItem (nmcd);
 /*
 * fix is to check for null.
 *
 * NOTE: This only happens on XP with the version 6.00 of
 * COMCTL32.DLL,
 */
-if (item is null) return LRESULT.NULL;
+if (item is null) return null;
 /*
 * Feature in Windows.  Under certain circumstances, Windows
 * sends CDDS_ITEMPOSTPAINT for an empty rectangle.  This is
 * not a problem providing that graphics do not occur outside
 *
 * NOTE:  This seems to happen when both I_IMAGECALLBACK
 * and LPSTR_TEXTCALLBACK are used at the same time with
 * TVM_SETITEM.
 */
-if (nmcd.nmcd.rc.left >= nmcd.nmcd.rc.right || nmcd.nmcd.rc.top >= nmcd.nmcd.rc.bottom) return LRESULT.NULL;
+if (nmcd.nmcd.rc.left >= nmcd.nmcd.rc.right || nmcd.nmcd.rc.top >= nmcd.nmcd.rc.bottom) return null;
-if (!OS.IsWindowVisible (handle)) return LRESULT.NULL;
+if (!OS.IsWindowVisible (handle)) return null;
 if ((style & DWT.FULL_SELECTION) !is 0 || findImageControl () !is null || ignoreDrawSelection || explorerTheme) {
 OS.SetBkMode (hDC, OS.TRANSPARENT);
 }
 bool selected = isItemSelected (nmcd);
 bool hot = explorerTheme && (nmcd.nmcd.uItemState & OS.CDIS_HOT) !is 0;
 }
 }
 }
 }
 }
-return cast(LRESULT) (OS.CDRF_DODEFAULT);
+return new LRESULT (OS.CDRF_DODEFAULT);
 }
 LRESULT CDDS_ITEMPREPAINT (NMTVCUSTOMDRAW* nmcd, int wParam, int lParam) {
 /*
 * Even when custom draw is being ignored, the font needs
 * fix is to check for null.
 *
 * NOTE: This only happens on XP with the version 6.00 of
 * COMCTL32.DLL,
 */
-if (item is null) return LRESULT.NULL;
+if (item is null) return null;
 auto hDC = nmcd.nmcd.hdc;
 int index = hwndHeader !is null ? OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0) : 0;
 HFONT hFont = item.cellFont !is null ? item.cellFont [index] : cast(HFONT)-1;
 if (hFont is cast(HFONT)-1) hFont = item.font;
 if (hFont !is cast(HFONT)-1) OS.SelectObject (hDC, hFont);
 if (ignoreCustomDraw || nmcd.nmcd.rc.left is nmcd.nmcd.rc.right) {
-return cast(LRESULT) (hFont is cast(HFONT)-1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT);
+return new LRESULT (hFont is cast(HFONT)-1 ? OS.CDRF_DODEFAULT : OS.CDRF_NEWFONT);
 }
 int count = 0;
 RECT* clipRect = null;
 if (hwndHeader !is null) {
 count = OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0);
 event.height = itemRect.bottom - itemRect.top;
 sendEvent (DWT.MeasureItem, event);
 event.gc = null;
 gc.dispose ();
 OS.RestoreDC (hDC, nSavedDC);
-if (isDisposed () || item.isDisposed ()) return LRESULT.NULL;
+if (isDisposed () || item.isDisposed ()) return null;
 if (hwndHeader !is null) {
 if (count is 0) {
 if (event.x + event.width > scrollWidth) {
 setScrollWidth (scrollWidth = event.x + event.width);
 }
 sendEvent (DWT.EraseItem, event);
 event.gc = null;
 int newTextClr = data.foreground;
 gc.dispose ();
 OS.RestoreDC (hDC, nSavedDC);
-if (isDisposed () || item.isDisposed ()) return LRESULT.NULL;
+if (isDisposed () || item.isDisposed ()) return null;
 if (event.doit) {
 ignoreDrawForeground = (event.detail & DWT.FOREGROUND) is 0;
 ignoreDrawBackground = (event.detail & DWT.BACKGROUND) is 0;
 ignoreDrawSelection = (event.detail & DWT.SELECTED) is 0;
 ignoreDrawFocus = (event.detail & DWT.FOCUSED) is 0;
 if (linesVisible) itemRect.bottom++;
 if (clipRect !is null) {
 OS.IntersectClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
 }
 OS.ExcludeClipRect (hDC, itemRect.left, itemRect.top, itemRect.right, itemRect.bottom);
-return cast(LRESULT) (OS.CDRF_DODEFAULT | OS.CDRF_NOTIFYPOSTPAINT);
+return new LRESULT (OS.CDRF_DODEFAULT | OS.CDRF_NOTIFYPOSTPAINT);
 }
 /*
 * Feature in Windows.  When the tree has the style
 * TVS_FULLROWSELECT, the background color for the
 * entire row is filled when an item is painted,
 nmcd.nmcd.uItemState &= ~OS.CDIS_FOCUS;
 OS.MoveMemory (cast(void*)lParam, nmcd, NMTVCUSTOMDRAW.sizeof);
 }
 }
 }
-LRESULT result = LRESULT.NULL;
+LRESULT result = null;
 if (clrText is -1 && clrTextBk is -1 && hFont is cast(HFONT)-1) {
-result = cast(LRESULT) (OS.CDRF_DODEFAULT | OS.CDRF_NOTIFYPOSTPAINT);
+result = new LRESULT (OS.CDRF_DODEFAULT | OS.CDRF_NOTIFYPOSTPAINT);
 } else {
-result = cast(LRESULT) (OS.CDRF_NEWFONT | OS.CDRF_NOTIFYPOSTPAINT);
+result = new LRESULT (OS.CDRF_NEWFONT | OS.CDRF_NOTIFYPOSTPAINT);
 if (hFont !is cast(HFONT)-1) OS.SelectObject (hDC, hFont);
 if (OS.IsWindowEnabled (handle) && OS.IsWindowVisible (handle)) {
 /*
 * Feature in Windows.  Windows does not fill the entire cell
 * with the background color when TVS_FULLROWSELECT is not set.
 }
 return result;
 }
 LRESULT CDDS_POSTPAINT (NMTVCUSTOMDRAW* nmcd, int wParam, int lParam) {
-if (ignoreCustomDraw) return LRESULT.NULL;
+if (ignoreCustomDraw) return null;
 if (OS.IsWindowVisible (handle)) {
 if (OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ()) {
 if (sortColumn !is null && sortDirection !is DWT.NONE) {
 if (findImageControl () is null) {
 int index = indexOf (sortColumn);
 OS.SetRect (&rect, rect.left, top, rect.right, top + height);
 OS.DrawEdge (hDC, &rect, OS.BDR_SUNKENINNER, OS.BF_BOTTOM);
 }
 }
 }
-return cast(LRESULT) (OS.CDRF_DODEFAULT);
+return new LRESULT (OS.CDRF_DODEFAULT);
 }
 LRESULT CDDS_PREPAINT (NMTVCUSTOMDRAW* nmcd, int wParam, int lParam) {
 if (explorerTheme) {
 if ((OS.IsWindowEnabled (handle) && hooks (DWT.EraseItem)) || findImageControl () !is null) {
 RECT rect;
 OS.SetRect (&rect, nmcd.nmcd.rc.left, nmcd.nmcd.rc.top, nmcd.nmcd.rc.right, nmcd.nmcd.rc.bottom);
 drawBackground (nmcd.nmcd.hdc, &rect);
 }
 }
-return cast(LRESULT) (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
+return new LRESULT (OS.CDRF_NOTIFYITEMDRAW | OS.CDRF_NOTIFYPOSTPAINT);
 }
-override LRESULT callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
+override int callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
-if (handle is null) return LRESULT.NULL;
+if (handle is null) return 0;
 if (hwndParent !is null && hwnd is hwndParent) {
-return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
+return OS.DefWindowProc (hwnd, msg, wParam, lParam);
 }
 if (hwndHeader !is null && hwnd is hwndHeader) {
-return cast(LRESULT) OS.CallWindowProc (HeaderProc, hwnd, msg, wParam, lParam);
+return OS.CallWindowProc (HeaderProc, hwnd, msg, wParam, lParam);
 }
 switch (msg) {
 case OS.WM_SETFOCUS: {
 /*
 * Feature in Windows.  When a tree control processes WM_SETFOCUS,
 case OS.WM_PAINT:
 painted = true;
 break;
 default:
 }
-return cast(LRESULT) code;
+return code;
 }
 override void checkBuffered () {
 super.checkBuffered ();
 if ((style & DWT.VIRTUAL) !is 0) {
 updateScrollBar ();
 return code;
 }
 case OS.WM_NCPAINT: {
 LRESULT result = wmNCPaint (hwnd, wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result.value;
 break;
 }
 case OS.WM_PRINT: {
 LRESULT result = wmPrint (hwnd, wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result.value;
 break;
 }
 case OS.WM_COMMAND:
 case OS.WM_NOTIFY:
 case OS.WM_SYSCOLORCHANGE: {
 }
 OS.SetScrollInfo (handle, OS.SB_VERT, &info, true);
 int code = OS.SendMessage (handle, OS.WM_VSCROLL, wParam, lParam);
 OS.GetScrollInfo (handle, OS.SB_VERT, &info);
 OS.SetScrollInfo (hwndParent, OS.SB_VERT, &info, true);
-return cast(LRESULT)code;
+return code;
 }
 default:
 }
 return callWindowProc (hwnd, msg, wParam, lParam);
 }
 return super.windowProc (hwnd, msg, wParam, lParam);
 }
 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;
 /*
 * Feature in Windows.  The tree control beeps
 * in WM_CHAR when the search for the item that
 * matches the key stroke fails.  This is the
 * standard tree behavior but is unexpected when
 return super.WM_GETOBJECT (wParam, lParam);
 }
 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;
 switch (wParam) {
 case OS.VK_SPACE:
 /*
 * Ensure that the window proc does not process VK_SPACE
 * so that it can be handled in WM_CHAR.  This allows the
 tvItem.hItem = hNewItem;
 OS.SendMessage (handle, OS.TVM_GETITEM, 0, &tvItem);
 Event event = new Event ();
 event.item = _getItem (hNewItem, tvItem.lParam);
 postEvent (DWT.Selection, event);
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 }
 if (OS.GetKeyState (OS.VK_CONTROL) < 0) {
 HANDLE hItem = cast(HANDLE) OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
 if (hItem !is null) {
 }
 }
 }
 int code = callWindowProc (handle, OS.WM_KEYDOWN, wParam, lParam);
 hAnchor = cast(HANDLE) OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 default:
 }
 return result;
 }
 if (deselected) {
 Event event = new Event ();
 event.item = _getItem (lpht.hItem);
 postEvent (DWT.Selection, event);
 }
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 /* Look for check/uncheck */
 if ((style & DWT.CHECK) !is 0) {
 if ((lpht.flags & OS.TVHT_ONITEMSTATEICON) !is 0) {
 }
 int code = callWindowProc (handle, OS.WM_LBUTTONDOWN, wParam, lParam);
 if (!display.captureChanged && !isDisposed ()) {
 if (OS.GetCapture () !is handle) OS.SetCapture (handle);
 }
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 }
 /* Get the selected state of the item under the mouse */
 TVITEM tvItem;
 if ((bits & OS.TVS_DISABLEDRAGDROP) is 0) {
 sendMouseEvent (DWT.MouseUp, 1, handle, OS.WM_LBUTTONUP, wParam, lParam);
 }
 }
 dragStarted = false;
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 override LRESULT WM_MOUSEMOVE (int wParam, int lParam) {
 Display display = this.display;
 LRESULT result = super.WM_MOUSEMOVE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 if (itemToolTipHandle !is null && hwndHeader !is null) {
 /*
 * Bug in Windows.  On some machines that do not have XBUTTONs,
 * the MK_XBUTTON1 and OS.MK_XBUTTON2 bits are sometimes set,
 * causing mouse capture to become stuck.  The fix is to test
 }
 return result;
 }
 override LRESULT WM_MOVE (int wParam, int lParam) {
-if (ignoreResize) return LRESULT.NULL;
+if (ignoreResize) return null;
 return super.WM_MOVE (wParam, lParam);
 }
 override LRESULT WM_RBUTTONDOWN (int wParam, int lParam) {
 /*
 return super.WM_PAINT (wParam, lParam);
 }
 override LRESULT WM_PRINTCLIENT (int wParam, int lParam) {
 LRESULT result = super.WM_PRINTCLIENT (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Feature in Windows.  For some reason, when WM_PRINT is used
 * to capture an image of a hierarchy that contains a tree with
 * columns, the clipping that is used to stop the first column
 * from drawing on top of subsequent columns stops the first
 * is happening in WM_PRINTCLIENT, the redrawing is not visible.
 */
 printClient = true;
 int code = callWindowProc (handle, OS.WM_PRINTCLIENT, wParam, lParam);
 printClient = false;
-return cast(LRESULT) (code);
+return new LRESULT (code);
 }
 override LRESULT WM_SETFOCUS (int wParam, int lParam) {
 /*
 * Bug in Windows.  When a tree item that has an image
 return super.WM_SETFOCUS (wParam, lParam);
 }
 override LRESULT WM_SETFONT (int wParam, int lParam) {
 LRESULT result = super.WM_SETFONT (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 if (hwndHeader !is null) {
 /*
 * Bug in Windows.  When a header has a sort indicator
 * triangle, Windows resizes the indicator based on the
 * size of the n-1th font.  The fix is to always make
 return result;
 }
 override LRESULT WM_SETREDRAW (int wParam, int lParam) {
 LRESULT result = super.WM_SETREDRAW (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Bug in Windows.  Under certain circumstances, when
 * WM_SETREDRAW is used to turn off drawing and then
 * TVM_GETITEMRECT is sent to get the bounds of an item
 * that is not inside the client area, Windows segment
 * NOTE:  This problem is intermittent and happens on
 * Windows Vista running under the theme manager.
 */
 if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
 int code = OS.DefWindowProc (handle, OS.WM_SETREDRAW, wParam, lParam);
-return code is 0 ? LRESULT.ZERO : cast(LRESULT) (code);
+return code is 0 ? LRESULT.ZERO : new LRESULT (code);
 }
 return result;
 }
 override LRESULT WM_SIZE (int wParam, int lParam) {
 if ((style & DWT.FULL_SELECTION) !is 0) {
 OS.InvalidateRect (handle, null, false);
 }
 }
 }
-if (ignoreResize) return LRESULT.NULL;
+if (ignoreResize) return null;
 return super.WM_SIZE (wParam, lParam);
 }
 override LRESULT WM_SYSCOLORCHANGE (int wParam, int lParam) {
 LRESULT result = super.WM_SYSCOLORCHANGE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Bug in Windows.  When the tree is using the explorer
 * theme, it does not use COLOR_WINDOW_TEXT for the
 * default foreground color.  The fix is to explicitly
 * set the foreground.
 override LRESULT wmColorChild (int wParam, int lParam) {
 if (findImageControl () !is null) {
 if (OS.COMCTL32_MAJOR < 6) {
 return super.wmColorChild (wParam, lParam);
 }
-return cast(LRESULT) (OS.GetStockObject (OS.NULL_BRUSH));
+return new LRESULT ( cast(int) OS.GetStockObject (OS.NULL_BRUSH));
 }
 /*
 * Feature in Windows.  Tree controls send WM_CTLCOLOREDIT
 * to allow application code to change the default colors.
 * This is undocumented and conflicts with TVM_SETTEXTCOLOR
 * and TVM_SETBKCOLOR, the documented way to do this.  The
 * fix is to ignore WM_CTLCOLOREDIT messages from trees.
 */
-return LRESULT.NULL;
+return null;
 }
 override LRESULT wmNotify (NMHDR* hdr, int wParam, int lParam) {
 if (hdr.hwndFrom is itemToolTipHandle && hwndHeader !is null) {
 if (!OS.IsWinCE) {
 OS.SendMessage (handle, OS.TVM_HITTEST, 0, &lpht);
 if (lpht.hItem !is null) {
 auto hDC = OS.GetDC (handle);
 HFONT oldFont, newFont = cast(HFONT) OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 if (newFont !is null) oldFont = OS.SelectObject (hDC, newFont);
-LRESULT result = LRESULT.NULL;
+LRESULT result = null;
 RECT rect;
 OS.GetClientRect (hwndParent, &rect);
 OS.MapWindowPoints (hwndParent, handle, cast(POINT*) &rect, 2);
 TreeItem item = _getItem (lpht.hItem);
 int index = 0, count = Math.max (1, OS.SendMessage (hwndHeader, OS.HDM_GETITEMCOUNT, 0, 0));
 }
 index++;
 }
 if (newFont !is null) OS.SelectObject (hDC, oldFont);
 OS.ReleaseDC (handle, hDC);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 }
 }
 default:
 }
 }

Mercurial > projects > dwt-win

comparison dwt/widgets/Tree.d @ 108:6f75fdfa1bcd