Ticket #198: fix-sigint+term.patch

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

@@ -150 +150 @@
 #endif
 }
 
+ATLASDLLIMPEXP void Atlas_CloseWindow()
+{
+    if (wxTheApp) {
+        wxWindow *w;
+        while ((w = wxTheApp->GetTopWindow())) {
+            wxCloseEvent ev(wxEVT_CLOSE_WINDOW);
+            wxPostEvent(w, ev);
+
+            if (!w->GetParent())
+                return;
+
+            wxWindow *ow = w;
+            while (ow == wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow() != NULL)
+                usleep(100*1000);
+        }
+    }
+}
+
 ATLASDLLIMPEXP void Atlas_DisplayError(const wchar_t* text, size_t WXUNUSED(flags))
 {
     // This is called from the game thread.

trunk/source/tools/atlas/AtlasUI/Misc/DLLInterface.h

@@ -25 +25 @@
 ATLASDLLIMPEXP void Atlas_SetMessagePasser(AtlasMessage::MessagePasser*);
 ATLASDLLIMPEXP void Atlas_SetDataDirectory(const wchar_t* path);
 ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type);
+ATLASDLLIMPEXP void Atlas_CloseWindow();
 
 ATLASDLLIMPEXP void Atlas_GLSetCurrent(void* context);
 ATLASDLLIMPEXP void Atlas_GLSwapBuffers(void* context);

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

@@ -692 +692 @@
 
 void ScenarioEditor::OnOpen(wxCommandEvent& WXUNUSED(event))
 {
-    wxFileDialog dlg (NULL, wxFileSelectorPromptStr,
+    wxFileDialog dlg(wxTheApp->GetTopWindow(), wxFileSelectorPromptStr,
         Datafile::GetDataDirectory() + _T("/mods/public/maps/scenarios"), m_OpenFilename,
         _T("PMP files (*.pmp)|*.pmp|All files (*.*)|*.*"),
         wxFD_OPEN);
+    wxTheApp->SetTopWindow(&dlg);
+
     // Set default filter
     dlg.SetFilterIndex(0);
 

trunk/source/tools/atlas/GameInterface/GameLoop.cpp

@@ -51 +51 @@
 
 // Loaded from DLL:
 void (*Atlas_StartWindow)(const wchar_t* type);
+void (*Atlas_CloseWindow)();
 void (*Atlas_SetDataDirectory)(const wchar_t* path);
 void (*Atlas_SetConfigDirectory)(const wchar_t* path);
 void (*Atlas_SetMessagePasser)(MessagePasser*);
@@ -217 +218 @@
         // Pump SDL events (e.g. hotkeys)
         SDL_Event_ ev;
         while (SDL_PollEvent(&ev.ev))
+        {
             in_dispatch_event(&ev);
+            if (ev.ev.type == SDL_QUIT)
+                Atlas_CloseWindow();
+        }
 
         if (g_GUI)
             g_GUI->TickObjects();
@@ -276 +281 @@
     try
     {
         dll.LoadSymbol("Atlas_StartWindow", Atlas_StartWindow);
+        dll.LoadSymbol("Atlas_CloseWindow", Atlas_CloseWindow);
         dll.LoadSymbol("Atlas_SetMessagePasser", Atlas_SetMessagePasser);
         dll.LoadSymbol("Atlas_SetDataDirectory", Atlas_SetDataDirectory);
         dll.LoadSymbol("Atlas_SetConfigDirectory", Atlas_SetConfigDirectory);