pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-enabled other messagebox tests, moved the SDL_Init() call as late as possible to show the circumstances where it's needed.

Browse source
This commit is contained in:
Sam Lantinga 2013-07-14 12:16:10 -07:00
parent 7bc74ebaa4
commit 87baf66d18
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
test/testmessage.c
View file

@ -60,7 +60,7 @@ button_messagebox(void *eventNumber)
data.message = "This is a custom messagebox from a background thread."; data.message = "This is a custom messagebox from a background thread.";
} }
success =SDL_ShowMessageBox(&data, &button); success = SDL_ShowMessageBox(&data, &button);
if (success == -1) { if (success == -1) {
printf("Error Presenting MessageBox: %s\n", SDL_GetError()); printf("Error Presenting MessageBox: %s\n", SDL_GetError());
if (eventNumber) { if (eventNumber) {
@ -88,13 +88,6 @@ main(int argc, char *argv[])
{ {
int success; int success;
/* Load the SDL library */
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
return (1);
}
#if 0
success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, success = SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
"Simple MessageBox", "Simple MessageBox",
"This is a simple error MessageBox", "This is a simple error MessageBox",
@ -135,7 +128,16 @@ main(int argc, char *argv[])
button_messagebox(NULL); button_messagebox(NULL);
/* Test showing a message box from a background thread */ /* Test showing a message box from a background thread.
On Mac OS X, the video subsystem needs to be initialized for this
to work, since the message box events are dispatched by the Cocoa
subsystem on the main thread.
*/
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL video subsystem: %s\n", SDL_GetError());
return (1);
}
{ {
int status = 0; int status = 0;
SDL_Event event; SDL_Event event;
@ -153,7 +155,6 @@ main(int argc, char *argv[])
printf("Message box thread return %i\n", status); printf("Message box thread return %i\n", status);
} }
#endif
/* Test showing a message box with a parent window */ /* Test showing a message box with a parent window */
{ {