Ticket #2847: fix-atlas-sdl2.v2.diff

source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp

@@ -521 +521 @@
     // Need to make sure the canvas is realised, so that its context is valid
     // this solves the "invalid drawable" error
     Show(true);
+    Raise();
 #endif
 #ifdef __WXGTK__
     // TODO: wxSafeYield causes issues on wxOSX 2.9, is it necessary?
@@ -529 +530 @@
 
     // Send setup messages to game engine:
 
+#ifdef __WXGTK__
+    // On Linux we need to initialize SDL graphics system here, or it breaks SDL2
+    // but this apparently breaks some drivers on Windows
+    POST_MESSAGE(InitSDL, ());
+#endif
+
     POST_MESSAGE(SetCanvas, (static_cast<wxGLCanvas*>(canvas),
         canvas->GetClientSize().GetWidth(), canvas->GetClientSize().GetHeight()));
 
+#ifndef __WXGTK__
+    // Initialize SDL graphics system here if not on Linux
+    POST_MESSAGE(InitSDL, ());
+#endif
+
     POST_MESSAGE(InitGraphics, ());
 
     canvas->InitSize();

source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp

@@ -1 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -62 +62 @@
     g_VideoMode.InitNonSDL();
 }
 
-MESSAGEHANDLER(InitGraphics)
+MESSAGEHANDLER(InitSDL)
 {
     UNUSED2(msg);
 
@@ -81 +81 @@
     SDL_GL_LoadLibrary(NULL); // NULL = use default
     // (it shouldn't hurt if this is called multiple times, I think)
 #endif
+}
 
+MESSAGEHANDLER(InitGraphics)
+{
+    UNUSED2(msg);
+
     ogl_Init();
 
     InitGraphics(g_AtlasGameLoop->args, g_InitFlags);

source/tools/atlas/GameInterface/Messages.h

@@ -32 +32 @@
 // Initialise some engine code. Must be called before anything else.
 MESSAGE(Init, );
 
+// Initialise SDL-related code. Must be called before SetCanvas and InitGraphics.
+MESSAGE(InitSDL, );
+
 // Initialise graphics-related code. Must be called after the first SetCanvas,
 // and before much else.
 MESSAGE(InitGraphics, );
-
 // Shut down engine/graphics code.
 MESSAGE(Shutdown, );