ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4640 from leoetlino/panic-alerts-on-top 

DolphinWX: Always keep panic alerts on top
This commit is contained in:
Matthew Parlane 2017-01-13 11:52:59 +13:00 committed by GitHub
parent 5790f15be8 5fd486014b
commit 1debc8eea1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Frame.cpp
View File

@ -707,7 +707,8 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
{
wxString caption = event.GetString().BeforeFirst(':');
wxString text = event.GetString().AfterFirst(':');
bPanicResult = (wxYES == wxMessageBox(text, caption, event.GetInt() ? wxYES_NO : wxOK,
bPanicResult =
(wxYES == wxMessageBox(text, caption, wxSTAY_ON_TOP | (event.GetInt() ? wxYES_NO : wxOK),
wxWindow::FindFocus()));
panic_event.Set();
}

3
Source/Core/DolphinWX/Main.cpp
View File

@ -360,7 +360,8 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
npd->AppendChat("/!\\ " + std::string{text});
return true;
}
return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption), (yes_no) ? wxYES_NO : wxOK,
return wxYES == wxMessageBox(StrToWxStr(text), StrToWxStr(caption),
wxSTAY_ON_TOP | ((yes_no) ? wxYES_NO : wxOK),
wxWindow::FindFocus());
}
else