Ticket #2427: 2427_dic.diff

source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -1 @@
-/* Copyright (C) 2012 Wildfire Games.
+/* Copyright (C) 2014 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -122 +122 @@
     g_ConfigDir = config.GetPath(wxPATH_GET_SEPARATOR);
 }
 
-ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type)
-{
-    // Initialise libxml2
-    // (If we're executed from the game instead, it has the responsibility to initialise libxml2)
-    LIBXML_TEST_VERSION
-    
-    g_InitialWindowType = type;
-#ifdef __WXMSW__
-    wxEntry(g_Module);
-#else
-#ifdef __WXGTK__
-    // Because we do GL calls from a secondary thread, Xlib needs to
-    // be told to support multiple threads safely
-    int status = XInitThreads();
-    if (status == 0)
-    {
-        fprintf(stderr, "Error enabling thread-safety via XInitThreads\n");
-    }
-#endif
-    int argc = 1;
-    char atlas[] = "atlas";
-    char *argv[] = {atlas, NULL};
-#ifndef __WXOSX__
-    wxEntry(argc, argv);
-#else
-    // Fix for OS X init (see http://trac.wildfiregames.com/ticket/2427 )
-    // If we launched from in-game, SDL started NSApplication which will
-    // break some things in wxWidgets
-    wxEntryStart(argc, argv);
-    wxTheApp->OnInit();
-    wxTheApp->OnRun();
-    wxTheApp->OnExit();
-    wxEntryCleanup();
-#endif
-
-#endif
-}
-
 ATLASDLLIMPEXP void Atlas_DisplayError(const wchar_t* text, size_t WXUNUSED(flags))
 {
     // This is called from the game thread.
@@ -186 +148 @@
 class AtlasDLLApp : public wxApp
 {
 public:
-
 #ifdef __WXOSX__
     virtual bool OSXIsGUIApplication()
     {
@@ -365 +326 @@
 };
 
 IMPLEMENT_APP_NO_MAIN(AtlasDLLApp);
+
+ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type)
+{
+    // Initialise libxml2
+    // (If we're executed from the game instead, it has the responsibility to initialise libxml2)
+    LIBXML_TEST_VERSION
+    
+    g_InitialWindowType = type;
+#ifdef __WXMSW__
+    wxEntry(g_Module);
+#else
+#ifdef __WXGTK__
+    // Because we do GL calls from a secondary thread, Xlib needs to
+    // be told to support multiple threads safely
+    int status = XInitThreads();
+    if (status == 0)
+    {
+        fprintf(stderr, "Error enabling thread-safety via XInitThreads\n");
+    }
+#endif
+    int argc = 1;
+    char atlas[] = "atlas";
+    char *argv[] = {atlas, NULL};
+#ifndef __WXOSX__
+    wxEntry(argc, argv);
+#else
+    // Fix for OS X init (see http://trac.wildfiregames.com/ticket/2427 )
+    // If we launched from in-game, SDL started NSApplication which will
+    // break some things in wxWidgets
+    wxApp::SetInstance(new AtlasDLLApp());
+    wxEntry(argc, argv);
+#endif
+    
+#endif
+}
+