Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

No files matched your search

Source/Core/DolphinWX/Frame.cpp
+3 -2
View File
@@ -707,8 +707,9 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
{ {
wxString caption = event.GetString().BeforeFirst(':'); wxString caption = event.GetString().BeforeFirst(':');
wxString text = event.GetString().AfterFirst(':'); wxString text = event.GetString().AfterFirst(':');
bPanicResult = (wxYES == wxMessageBox(text, caption, event.GetInt() ? wxYES_NO : wxOK, bPanicResult =
wxWindow::FindFocus())); (wxYES == wxMessageBox(text, caption, wxSTAY_ON_TOP | (event.GetInt() ? wxYES_NO : wxOK),
wxWindow::FindFocus()));
panic_event.Set(); panic_event.Set();
} }
break; break;
Source/Core/DolphinWX/Main.cpp
+2 -1
View File
@@ -360,7 +360,8 @@ bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*
npd->AppendChat("/!\\ " + std::string{text}); npd->AppendChat("/!\\ " + std::string{text});
return true; 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()); wxWindow::FindFocus());
} }
else else