From 0028ee96b34d566f459f690a44e0c5ffcc7621a0 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Wed, 9 Nov 2016 01:10:32 +0100 Subject: [PATCH] Host: Remove the Host_RequestFullscreen() method. No longer needed, since the exclusive mode switch is now handled synchronously on the CPU thread. --- Source/Core/Core/Host.h | 1 - Source/Core/DolphinQt2/Host.cpp | 3 --- Source/Core/DolphinWX/Frame.cpp | 15 --------------- Source/Core/DolphinWX/Main.cpp | 7 ------- Source/Core/DolphinWX/MainNoGUI.cpp | 4 ---- 5 files changed, 30 deletions(-) diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h index 2f517c4c8e..349d65f7a6 100644 --- a/Source/Core/Core/Host.h +++ b/Source/Core/Core/Host.h @@ -31,7 +31,6 @@ void Host_Message(int Id); void Host_NotifyMapLoaded(); void Host_RefreshDSPDebuggerWindow(); void Host_RequestRenderWindowSize(int width, int height); -void Host_RequestFullscreen(bool enable_fullscreen); void Host_SetStartupDebuggingParameters(); void Host_SetWiiMoteConnectionState(int _State); void Host_UpdateDisasmDialog(); diff --git a/Source/Core/DolphinQt2/Host.cpp b/Source/Core/DolphinQt2/Host.cpp index 906853bc3c..0797f4f39e 100644 --- a/Source/Core/DolphinQt2/Host.cpp +++ b/Source/Core/DolphinQt2/Host.cpp @@ -100,9 +100,6 @@ void Host_YieldToUI() void Host_UpdateMainFrame() { } -void Host_RequestFullscreen(bool enable) -{ -} void Host_RequestRenderWindowSize(int w, int h) { } diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 2611ec491e..5d7fd6b316 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -701,21 +701,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event) } break; - case IDM_FULLSCREEN_REQUEST: - { - bool enable_fullscreen = event.GetInt() == 0 ? false : true; - ToggleDisplayMode(enable_fullscreen); - if (m_RenderFrame != nullptr) - m_RenderFrame->ShowFullScreen(enable_fullscreen); - - // If the stop dialog initiated this fullscreen switch then we need - // to pause the emulator after we've completed the switch. - // TODO: Allow the renderer to switch fullscreen modes while paused. - if (m_confirmStop) - Core::SetState(Core::CORE_PAUSE); - } - break; - case WM_USER_CREATE: if (SConfig::GetInstance().bHideCursor) m_RenderParent->SetCursor(wxCURSOR_BLANK); diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 444b270d39..f87de73a0c 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -452,13 +452,6 @@ void Host_RequestRenderWindowSize(int width, int height) main_frame->GetEventHandler()->AddPendingEvent(event); } -void Host_RequestFullscreen(bool enable_fullscreen) -{ - wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_FULLSCREEN_REQUEST); - event.SetInt(enable_fullscreen ? 1 : 0); - main_frame->GetEventHandler()->AddPendingEvent(event); -} - void Host_SetStartupDebuggingParameters() { SConfig& StartUp = SConfig::GetInstance(); diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index 6c8a53b88d..b0c6e9a321 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -113,10 +113,6 @@ void Host_RequestRenderWindowSize(int width, int height) { } -void Host_RequestFullscreen(bool enable_fullscreen) -{ -} - void Host_SetStartupDebuggingParameters() { SConfig& StartUp = SConfig::GetInstance();