diff options
| author | Matthew Parlane <parlane@gmail.com> | 2017-01-13 09:52:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-13 09:52:09 +1300 |
| commit | 22546aef375ca541a8b9b01ab84c6efd3c3a7d81 (patch) | |
| tree | 5ea74460a8294c6a3508950199e5aef4d4858ae5 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 24f7ebc890a7aeebd2aa8b33fff64aa394f6930c (diff) | |
| parent | 443815df166f3460f9c9f211f4b597d52b8bbd72 (diff) | |
Merge pull request #4499 from ligfx/msgalertmainthread
DolphinWX: pass wxMsgAlert to main thread on non-GTK too
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 27e80ad7d7..daa7f7b5d5 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/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(); |