Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-25 10:14:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

If the video system has been initialized, only use that message box system.

Browse Source 
Don't pass a window from one video driver to the messagebox function of another video driver.  This makes bad things happen. :)
This commit is contained in:
Sam Lantinga
2013-07-14 11:11:42 -07:00
parent 9b5b5539ee
commit c8b8665f43
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/video/SDL_video.c
View File

@@ -3057,48 +3057,54 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{
int dummybutton;
int retval = -1;
SDL_bool relative_mode = SDL_GetRelativeMouseMode();
int show_cursor_prev = SDL_ShowCursor( 1 );
SDL_bool relative_mode;
int show_cursor_prev;
SDL_SetRelativeMouseMode( SDL_FALSE );
if (!messageboxdata) {
return SDL_InvalidParamError("messageboxdata");
}
relative_mode = SDL_GetRelativeMouseMode();
SDL_SetRelativeMouseMode(SDL_FALSE);
show_cursor_prev = SDL_ShowCursor(1);
if (!buttonid) {
buttonid = &dummybutton;
}
if (_this && _this->ShowMessageBox) {
if (_this->ShowMessageBox(_this, messageboxdata, buttonid) == 0) {
retval = 0;
retval = _this->ShowMessageBox(_this, messageboxdata, buttonid);
} else {
/* It's completely fine to call this function before video is initialized */
if (messageboxdata->window == NULL) {
#if SDL_VIDEO_DRIVER_WINDOWS
if ((retval == -1) && (WIN_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_COCOA
if ((retval == -1) && (Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_UIKIT
if ((retval == -1) && (UIKit_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_X11
if ((retval == -1) && (X11_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
}
if (retval == -1) {
SDL_SetError("No message system available");
}
}
/* It's completely fine to call this function before video is initialized */
#if SDL_VIDEO_DRIVER_WINDOWS
if ((retval == -1) && (WIN_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_COCOA
if ((retval == -1) && (Cocoa_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_UIKIT
if ((retval == -1) && (UIKit_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
#if SDL_VIDEO_DRIVER_X11
if ((retval == -1) && (X11_ShowMessageBox(messageboxdata, buttonid) == 0)) {
retval = 0;
}
#endif
SDL_ShowCursor(show_cursor_prev);
SDL_SetRelativeMouseMode(relative_mode);
SDL_ShowCursor( show_cursor_prev );
SDL_SetRelativeMouseMode( relative_mode );
if(retval == -1) {
SDL_SetError("No message system available");
}
return retval;
}