zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the startup window freeze under SDL2+Windows when a Yes/No box was supposed to be displayed.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4254 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2014-01-12 14:06:15 +00:00
parent 3e0ad77b5e
commit d452fd7891
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/build/src/sdlayer.c
View file

@ -123,7 +123,7 @@ HWND win_gethwnd(void)
if (SDL_GetWindowWMInfo(sdl_window, &wmInfo) != SDL_TRUE) if (SDL_GetWindowWMInfo(sdl_window, &wmInfo) != SDL_TRUE)
#endif #endif
{ {
initprintf("win_gethwnd: SDL_GetWindowWMInfo() failed: %s\n", SDL_GetError()); // initprintf("win_gethwnd: SDL_GetWindowWMInfo() failed: %s\n", SDL_GetError());
return 0; return 0;
} }
@ -162,6 +162,9 @@ int32_t wm_msgbox(char *name, char *fmt, ...)
return osx_msgbox(name, buf); return osx_msgbox(name, buf);
#elif defined HAVE_GTK2 #elif defined HAVE_GTK2
if (gtkbuild_msgbox(name, buf) >= 0) return 1; if (gtkbuild_msgbox(name, buf) >= 0) return 1;
#elif defined _WIN32
MessageBox(win_gethwnd(),buf,name,MB_OK|MB_TASKMODAL);
return 0;
#elif SDL_MAJOR_VERSION==2 #elif SDL_MAJOR_VERSION==2
# if !defined _WIN32 # if !defined _WIN32
// Replace all tab chars with spaces because the hand-rolled SDL message // Replace all tab chars with spaces because the hand-rolled SDL message
@ -187,7 +190,7 @@ int32_t wm_ynbox(char *name, char *fmt, ...)
char buf[2048]; char buf[2048];
char c; char c;
va_list va; va_list va;
#if (!defined(__APPLE__) && defined(HAVE_GTK2)) #if (!defined(__APPLE__) && defined(HAVE_GTK2)) || defined _WIN32
int32_t r; int32_t r;
#endif #endif
@ -201,6 +204,10 @@ int32_t wm_ynbox(char *name, char *fmt, ...)
return osx_ynbox(name, buf); return osx_ynbox(name, buf);
#elif defined HAVE_GTK2 #elif defined HAVE_GTK2
if ((r = gtkbuild_ynbox(name, buf)) >= 0) return r; if ((r = gtkbuild_ynbox(name, buf)) >= 0) return r;
#elif defined _WIN32
r = MessageBox(win_gethwnd(),buf,name,MB_YESNO|MB_ICONQUESTION|MB_TASKMODAL);
if (r==IDYES) return 1;
return 0;
#endif #endif
puts(buf); puts(buf);
puts(" (type 'Y' or 'N', and press Return or Enter to continue)"); puts(" (type 'Y' or 'N', and press Return or Enter to continue)");