From 810790372782648e58a0ff4710508656fe98c51b Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 7 Dec 2012 07:58:40 -0600 Subject: [PATCH] win32: support MinGW build A MinGW build is the same shape as a MSVC build (but without MzCOM), unlike a Cygwin build. original commit: 5b016b4c32b3fc4ca5439f98b80d73b10ea8d346 --- collects/mred/private/wx/win32/wndclass.rkt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/collects/mred/private/wx/win32/wndclass.rkt b/collects/mred/private/wx/win32/wndclass.rkt index 06f239bd..19201b46 100644 --- a/collects/mred/private/wx/win32/wndclass.rkt +++ b/collects/mred/private/wx/win32/wndclass.rkt @@ -119,19 +119,21 @@ (define wind-proc-ptr (function-ptr wind-proc _WndProc)) +(define-user32 CallWindowProcW (_wfun _fpointer _HWND _UINT _WPARAM _LPARAM -> _LRESULT)) + (define (control-proc w msg wParam lParam) - (let ([default-ctlproc (hwnd->ctlproc w)]) + (let ([default-ctlproc (hwnd->ctlproc-fptr w)]) (if (= msg WM_DESTROY) (begin (SetWindowLongPtrW w GWLP_WNDPROC (hwnd->ctlproc-fptr w)) (unregister-hwnd! w) - (default-ctlproc w msg wParam lParam)) + (CallWindowProcW default-ctlproc w msg wParam lParam)) (let ([wx (hwnd->wx w)]) (if wx (send wx ctlproc w msg wParam lParam (lambda (w msg wParam lParam) - (default-ctlproc w msg wParam lParam))) - (default-ctlproc w msg wParam lParam)))))) + (CallWindowProcW default-ctlproc w msg wParam lParam))) + (CallWindowProcW default-ctlproc w msg wParam lParam)))))) (define control_proc (function-ptr control-proc _WndProc))