Merge pull request #4499 from ligfx/msgalertmainthread

DolphinWX: pass wxMsgAlert to main thread on non-GTK too

Source/Core/DolphinWX/Frame.cpp

@@ -703,7 +703,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
       m_RenderParent->SetCursor(wxCURSOR_BLANK);
     break;
 
-#ifdef __WXGTK__
   case IDM_PANIC:
   {
     wxString caption = event.GetString().BeforeFirst(':');
@@ -713,7 +712,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
     panic_event.Set();
   }
   break;
-#endif
 
   case WM_USER_STOP:
     DoStop();

Source/Core/DolphinWX/Frame.h

@@ -116,9 +116,10 @@ public:
   const CGameListCtrl* GetGameListCtrl() const;
   wxMenuBar* GetMenuBar() const override;
 
-#ifdef __WXGTK__
   Common::Event panic_event;
   bool bPanicResult;
+
+#ifdef __WXGTK__
   std::recursive_mutex keystate_lock;
 #endif
 

Source/Core/DolphinWX/Main.cpp

@@ -352,10 +352,8 @@ void DolphinApp::OnIdle(wxIdleEvent& ev)
 
 bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/)
 {
-#ifdef __WXGTK__
   if (wxIsMainThread())
   {
-#endif
     NetPlayDialog*& npd = NetPlayDialog::GetInstance();
     if (npd != nullptr && npd->IsShown())
     {
@@ -364,7 +362,6 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
     }
     return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption), (yes_no) ? wxYES_NO : wxOK,
                                  wxWindow::FindFocus());
-#ifdef __WXGTK__
   }
   else
   {
@@ -375,7 +372,6 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
     main_frame->panic_event.Wait();
     return main_frame->bPanicResult;
   }
-#endif
 }
 
 std::string wxStringTranslator(const char* text)