mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-06 08:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4227 from ligfx/clean_objc

Browse source 
Don't force compile everything as Objective-C++ on macOS
This commit is contained in:
shuffle2 2016-10-02 19:42:04 -07:00 • committed by GitHub
commit 8fcc3b04e0
13 changed files with 89 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Core/DolphinWX/FrameTools.cpp
View file

@ -21,10 +21,6 @@
#include <wx/toolbar.h>
#include <wx/toplevel.h>
#ifdef __APPLE__
#include <AppKit/AppKit.h>
#endif
#include "Common/CDUtils.h"
#include "Common/CommonTypes.h"
#include "Common/FileSearch.h"
@ -1022,10 +1018,7 @@ void CFrame::StartGame(const std::string& filename)
}
#if defined(__APPLE__)
NSView* view = (NSView*)m_RenderFrame->GetHandle();
NSWindow* window = [view window];
[window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
m_RenderFrame->EnableFullScreenView(true);
#endif
wxBeginBusyCursor();
@ -1241,10 +1234,7 @@ void CFrame::OnStopped()
{
#if defined(__APPLE__)
// Disable the full screen button when not in a game.
NSView* view = (NSView*)m_RenderFrame->GetHandle();
NSWindow* window = [view window];
[window setCollectionBehavior:NSWindowCollectionBehaviorDefault];
m_RenderFrame->EnableFullScreenView(false);
#endif
// Make sure the window is not longer set to stay on top