From 87baf66d180dcd5c17a255a331eda2b5e311aee4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Sun, 14 Jul 2013 12:16:10 -0700
Subject: [PATCH] Re-enabled other messagebox tests, moved the SDL_Init() call
 as late as possible to show the circumstances where it's needed.

---
 test/testmessage.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/testmessage.c b/test/testmessage.c
index 8ac427097..7e4c561f7 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -60,7 +60,7 @@ button_messagebox(void *eventNumber)
         data.message = "This is a custom messagebox from a background thread.";
     }
 
-    success =SDL_ShowMessageBox(&data, &button);
+    success = SDL_ShowMessageBox(&data, &button);
     if (success == -1) {
         printf("Error Presenting MessageBox: %s\n", SDL_GetError());
         if (eventNumber) {
@@ -88,13 +88,6 @@ main(int argc, char *argv[])
 {
     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,
                 "Simple MessageBox",
                 "This is a simple error MessageBox",
@@ -135,7 +128,16 @@ main(int argc, char *argv[])
 
     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;
         SDL_Event event;
@@ -153,7 +155,6 @@ main(int argc, char *argv[])
 
         printf("Message box thread return %i\n", status);
     }
-#endif
 
     /* Test showing a message box with a parent window */
     {