From 1afd5a25f04b26dde373aa1b90f78dc469e436f0 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 20 Jan 1999 12:52:10 +0000 Subject: [PATCH] Use Callout to call RedrawWindow32. --- windows/x11drv/event.c | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c index fc4b0b7f10a..5a09b74a5d5 100644 --- a/windows/x11drv/event.c +++ b/windows/x11drv/event.c @@ -34,6 +34,7 @@ #include "winpos.h" #include "drive.h" #include "shell.h" +#include "callback.h" #include "keyboard.h" #include "mouse.h" #include "debug.h" @@ -110,10 +111,6 @@ static void EVENT_GetGeometry( Window win, int *px, int *py, unsigned int *pwidth, unsigned int *pheight ); -static BOOL32 (WINAPI *EVENT_RedrawWindow)( HWND32 hwnd, const RECT32 *rectUpdate, - HRGN32 hrgnUpdate, UINT32 flags ) = NULL; - - /*********************************************************************** * EVENT_Init * @@ -615,15 +612,9 @@ static void EVENT_Expose( WND *pWnd, XExposeEvent *event ) rect.right = rect.left + event->width; rect.bottom = rect.top + event->height; - if ( !EVENT_RedrawWindow ) - { - HMODULE32 hModule = GetModuleHandle32A( "USER32" ); - EVENT_RedrawWindow = GetProcAddress32( hModule, "RedrawWindow" ); - } - - EVENT_RedrawWindow( pWnd? pWnd->hwndSelf : 0, &rect, 0, - RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE | - (event->count ? 0 : RDW_ERASENOW) ); + Callout.RedrawWindow32( pWnd? pWnd->hwndSelf : 0, &rect, 0, + RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE | + (event->count ? 0 : RDW_ERASENOW) ); } @@ -643,15 +634,9 @@ static void EVENT_GraphicsExpose( WND *pWnd, XGraphicsExposeEvent *event ) rect.right = rect.left + event->width; rect.bottom = rect.top + event->height; - if ( !EVENT_RedrawWindow ) - { - HMODULE32 hModule = GetModuleHandle32A( "USER32" ); - EVENT_RedrawWindow = GetProcAddress32( hModule, "RedrawWindow" ); - } - - EVENT_RedrawWindow( pWnd? pWnd->hwndSelf : 0, &rect, 0, - RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE | - (event->count ? 0 : RDW_ERASENOW) ); + Callout.RedrawWindow32( pWnd? pWnd->hwndSelf : 0, &rect, 0, + RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE | + (event->count ? 0 : RDW_ERASENOW) ); }