piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't force compile everything as Objective-C++ on macOS

Browse Source
This commit is contained in:
Michael Maltese
2016-09-18 17:22:39 -07:00
parent 4c004b6dc9
commit cd19c9fa22
13 changed files with 89 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,10 +2,6 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
#include <atomic>
#include <cstddef>
#include <fstream>
@ -584,16 +580,6 @@ bool CFrame::RendererIsFullscreen()
fullscreen = m_RenderFrame->IsFullScreen();
}
#if defined(__APPLE__)
if (m_RenderFrame != nullptr)
{
NSView* view = (NSView*)m_RenderFrame->GetHandle();
NSWindow* window = [view window];
fullscreen = (([window styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask);
}
#endif
return fullscreen;
}
@ -1284,15 +1270,6 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
ToggleDisplayMode(enable_fullscreen);
#if defined(__APPLE__)
NSView* view = (NSView*)m_RenderFrame->GetHandle();
NSWindow* window = [view window];
if (enable_fullscreen != RendererIsFullscreen())
{
[window toggleFullScreen:nil];
}
#else
if (enable_fullscreen)
{
m_RenderFrame->ShowFullScreen(true, wxFULLSCREEN_ALL);
@ -1303,7 +1280,6 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
// Therefore we don't exit fullscreen from here if we are in exclusive mode.
m_RenderFrame->ShowFullScreen(false, wxFULLSCREEN_ALL);
}
#endif
if (SConfig::GetInstance().bRenderToMain)
{