Mercurial > sdl-ios-xcode
diff src/video/gapi/SDL_gapivideo.c @ 1523:21b1fbb53f4a
(patch tweaked a bit)
Date: Tue, 14 Mar 2006 03:30:11 +0000
From: Peter Mulholland
Subject: [SDL] Windows MessageBox() strangeness fixes
Hello all,
I *think* this should fix the issues that people were seeing with
MessageBox() not working and therefore assert() on mingw/msvc. Forgive
me if i've screwed up making the diff file - I'm a total newb when it
comes to things like CVS and diff.
It modifies a few files as I saw that FlushMessageQueue() was in both
the windx5 and windib driver, so I moved this into wincommon. It was
also in the gapi driver, so I changed that too. The function is now
WIN_FlushMessageQueue() in src/video/wincommon/SDL_syswm.c
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 14 Mar 2006 04:00:03 +0000 |
parents | 420b3f47806d |
children | 8d9bb0cf2c2a |
line wrap: on
line diff
--- a/src/video/gapi/SDL_gapivideo.c Tue Mar 14 03:04:50 2006 +0000 +++ b/src/video/gapi/SDL_gapivideo.c Tue Mar 14 04:00:03 2006 +0000 @@ -731,6 +731,12 @@ ShowWindow(SDL_Window, SW_SHOW); SetForegroundWindow(SDL_Window); + /* JC 14 Mar 2006 + Flush the message loop or this can cause big problems later + Especially if the user decides to use dialog boxes or assert()! + */ + WIN_FlushMessageQueue(); + /* Open GAPI display */ if( !gapi->useVga && this->hidden->useGXOpenDisplay ) if( !gapi->gxFunc.GXOpenDisplay(SDL_Window, GX_FULLSCREEN) ) @@ -1103,17 +1109,6 @@ gapi->gxFunc.GXEndDraw(); } -static void FlushMessageQueue() -{ - MSG msg; - while ( PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) ) { - if ( msg.message == WM_QUIT ) break; - TranslateMessage( &msg ); - DispatchMessage( &msg ); - } -} - - /* Note: If we are terminated, this could be called in the middle of another SDL video routine -- notably UpdateRects. */ @@ -1138,7 +1133,6 @@ DIB_DestroyWindow(this); SDL_UnregisterApp(); - FlushMessageQueue(); SDL_Window = NULL; #if defined(_WIN32_WCE)