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

comparison dwt/widgets/Shell.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
 HANDLE balloonTipHandle () {
 if (balloonTipHandle_ is null) createBalloonTipHandle ();
 return balloonTipHandle_;
 }
-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.ZERO;
+if (handle is null) return 0;
 if (hwnd is toolTipHandle_ || hwnd is balloonTipHandle_) {
-return cast(LRESULT) ToolTipProc( hwnd, msg, wParam, lParam);
+return OS.CallWindowProc (ToolTipProc, hwnd, msg, wParam, lParam);
 }
 if (hwndMDIClient_ !is null) {
-return cast(LRESULT) OS.DefFrameProc (hwnd, hwndMDIClient_, msg, wParam, lParam);
+return OS.DefFrameProc (hwnd, hwndMDIClient_, msg, wParam, lParam);
 }
 if (windowProc_ !is null) {
-return cast(LRESULT) windowProc_( hwnd, msg, wParam, lParam);
+return OS.CallWindowProc (windowProc_, hwnd, msg, wParam, lParam);
 }
 if ((style & DWT.TOOL) !is 0) {
 int trim = DWT.TITLE | DWT.CLOSE | DWT.MIN | DWT.MAX | DWT.BORDER | DWT.RESIZE;
-if ((style & trim) is 0) return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
+if ((style & trim) is 0) return OS.DefWindowProc (hwnd, msg, wParam, lParam);
 }
 if (parent !is null) {
 switch (msg) {
 case OS.WM_KILLFOCUS:
 case OS.WM_SETFOCUS:
-return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
+return OS.DefWindowProc (hwnd, msg, wParam, lParam);
 default:
 }
-return cast(LRESULT) DialogProc( hwnd, msg, wParam, lParam);
+return OS.CallWindowProc (DialogProc, hwnd, msg, wParam, lParam);
 }
-return cast(LRESULT) OS.DefWindowProc (hwnd, msg, wParam, lParam);
+return OS.DefWindowProc (hwnd, msg, wParam, lParam);
 }
 /**
 * Requests that the window manager close the receiver in
 * the same way it would be closed when the user clicks on
 return result;
 }
 override LRESULT WM_ERASEBKGND (int wParam, int lParam) {
 LRESULT result = super.WM_ERASEBKGND (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Feature in Windows.  When a shell is resized by dragging
 * the resize handles, Windows temporarily fills in black
 * rectangles where the new contents of the shell should
 * draw.  The fix is to always draw the background of shells.
 return result;
 }
 override LRESULT WM_ENTERIDLE (int wParam, int lParam) {
 LRESULT result = super.WM_ENTERIDLE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 if (OS.IsWinCE && display.runMessages) {
 if (display.runAsyncMessages (true)) display.wakeThread ();
 }
 return result;
 }
 override LRESULT WM_GETMINMAXINFO (int wParam, int lParam) {
 LRESULT result = super.WM_GETMINMAXINFO (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 if (minWidth !is DWT.DEFAULT || minHeight !is DWT.DEFAULT) {
 MINMAXINFO* info = cast(MINMAXINFO*)lParam;
 //OS.MoveMemory (info, lParam, MINMAXINFO.sizeof);
 if (minWidth !is DWT.DEFAULT) info.ptMinTrackSize.x = minWidth;
 if (minHeight !is DWT.DEFAULT) info.ptMinTrackSize.y = minHeight;
 return result;
 }
 override LRESULT WM_MOUSEACTIVATE (int wParam, int lParam) {
 LRESULT result = super.WM_MOUSEACTIVATE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Check for WM_MOUSEACTIVATE when an MDI shell is active
 * and stop the normal shell activation but allow the mouse
 * down to be delivered.
 display.ignoreRestoreFocus = true;
 display.lastHittest = hittest;
 display.lastHittestControl = null;
 if (hittest is OS.HTMENU || hittest is OS.HTSYSMENU) {
 display.lastHittestControl = control;
-return LRESULT.NULL;
+return null;
 }
 if (OS.IsWin95 && hittest is OS.HTCAPTION) {
 display.lastHittestControl = control;
 }
-return cast( LRESULT )(OS.MA_NOACTIVATE);
+return new LRESULT (OS.MA_NOACTIVATE);
 }
 }
 }
 }
-if (hittest is OS.HTMENU) return LRESULT.NULL;
+if (hittest is OS.HTMENU) return null;
 /*
 * Get the current location of the cursor,
 * not the location of the cursor when the
 * WM_MOUSEACTIVATE was generated.  This is
 int pos = OS.GetMessagePos ();
 pt.x = cast(short) (pos & 0xFFFF);
 pt.y = cast(short) (pos >> 16);
 }
 auto hwnd = OS.WindowFromPoint (pt);
-if (hwnd is null) return LRESULT.NULL;
+if (hwnd is null) return null;
 Control control = display.findControl (hwnd);
 /*
 * When a shell is created with DWT.ON_TOP and DWT.NO_FOCUS,
 * do not activate the shell when the user clicks on the
 if (control !is null && (control.state & CANVAS) !is 0) {
 if ((control.style & DWT.NO_FOCUS) !is 0) {
 int bits = DWT.ON_TOP | DWT.NO_FOCUS;
 if ((style & bits) is bits) {
 if (hittest is OS.HTBORDER || hittest is OS.HTCLIENT) {
-return cast( LRESULT )(OS.MA_NOACTIVATE);
+return new LRESULT (OS.MA_NOACTIVATE);
 }
 }
 }
 }
 setActiveControl (control);
-return LRESULT.NULL;
+return null;
 }
 override LRESULT WM_MOVE (int wParam, int lParam) {
 LRESULT result = super.WM_MOVE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 ToolTip tip = getCurrentToolTip ();
 if (tip !is null) tip.setVisible (false);
 return result;
 }
 }
 return result;
 }
 override LRESULT WM_NCHITTEST (int wParam, int lParam) {
-if (!OS.IsWindowEnabled (handle)) return LRESULT.NULL;
+if (!OS.IsWindowEnabled (handle)) return null;
 if (!isEnabled () || !isActive ()) {
-if (!Display.TrimEnabled) return cast( LRESULT )(OS.HTNOWHERE);
+if (!Display.TrimEnabled) return new LRESULT (OS.HTNOWHERE);
 int hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
 if (hittest is OS.HTCLIENT || hittest is OS.HTMENU) hittest = OS.HTBORDER;
-return cast( LRESULT )(hittest);
+return new LRESULT (hittest);
 }
 if (menuBar !is null && !menuBar.getEnabled ()) {
 int hittest = callWindowProc (handle, OS.WM_NCHITTEST, wParam, lParam);
 if (hittest is OS.HTMENU) hittest = OS.HTBORDER;
-return cast( LRESULT )(hittest);
+return new LRESULT (hittest);
 }
-return LRESULT.NULL;
+return null;
 }
 override LRESULT WM_NCLBUTTONDOWN (int wParam, int lParam) {
 LRESULT result = super.WM_NCLBUTTONDOWN (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * When the normal activation was interrupted in WM_MOUSEACTIVATE
 * because the active shell was an MDI shell, set the active window
 * to the top level shell but lock the active window and stop focus
 * changes.  This allows the user to interact the top level shell
 if (focusControl !is null && !focusControl.isDisposed ()) {
 focusControl.setFocus ();
 }
 display.lastHittestControl = null;
 display.ignoreRestoreFocus = false;
-return cast( LRESULT )(code);
+return new LRESULT (code);
 }
 override LRESULT WM_PALETTECHANGED (int wParam, int lParam) {
 if ( cast(HANDLE)wParam !is handle) {
 auto hPalette = display.hPalette;
 return super.WM_SETCURSOR (wParam, lParam);
 }
 override LRESULT WM_SETTINGCHANGE (int wParam, int lParam) {
 LRESULT result = super.WM_SETTINGCHANGE (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 static if (OS.IsPPC) {
 if (wParam is OS.SPI_SETSIPINFO) {
 /*
 * The SIP is in a new state.  Cache its new value.
 * Resize the Shell if it has the style DWT.RESIZE.
 return result;
 }
 override LRESULT WM_SHOWWINDOW (int wParam, int lParam) {
 LRESULT result = super.WM_SHOWWINDOW (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Bug in Windows.  If the shell is hidden while the parent
 * is iconic,  Windows shows the shell when the parent is
 * deiconified.  This does not happen if the shell is hidden
 * while the parent is not an icon.  The fix is to track
 return result;
 }
 override LRESULT WM_SYSCOMMAND (int wParam, int lParam) {
 LRESULT result = super.WM_SYSCOMMAND (wParam, lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 /*
 * Feature in Windows.  When the last visible window in
 * a process minimized, Windows swaps out the memory for
 * the process.  The assumption is that the user can no
 * longer interact with the window, so the memory can be
 return result;
 }
 override LRESULT WM_WINDOWPOSCHANGING (int wParam, int lParam) {
 LRESULT result = super.WM_WINDOWPOSCHANGING (wParam,lParam);
-if (result !is LRESULT.NULL) return result;
+if (result !is null) return result;
 auto lpwp = cast(WINDOWPOS*)lParam;
 //OS.MoveMemory (lpwp, lParam, WINDOWPOS.sizeof);
 if ((lpwp.flags & OS.SWP_NOSIZE) is 0) {
 lpwp.cx = Math.max (lpwp.cx, minWidth);
 int trim = DWT.TITLE | DWT.CLOSE | DWT.MIN | DWT.MAX;

Mercurial > projects > dwt-win

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