summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorSoren Jorvang <soren.jorvang@gmail.com>2011-03-21 16:06:40 +0000
committerSoren Jorvang <soren.jorvang@gmail.com>2011-03-21 16:06:40 +0000
commitd332cc342df2d960fb7e44b8c1c090212a72bb01 (patch)
treed3b9c058da2c0986f2cfe1eddbb087de049bd9b0 /Source
parent7f5da62d1c4360e5571ff457fe90d30f7b976d51 (diff)
OS X also needs to have the display resolution changed before
setting wxFULLSCREEN_ALL. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7390 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinWX/Src/Frame.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index e22b8e7bd2..0b293732a0 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -991,13 +991,11 @@ void CFrame::OnMouse(wxMouseEvent& event)
void CFrame::DoFullscreen(bool bF)
{
-#ifndef __linux__
+#ifdef _WIN32 // See r7388
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
#endif
ToggleDisplayMode(bF);
-#ifdef __linux__
- // Linux needs the wxWidgets window to go to fullscreen after the display resolution
- // is changed in order for the backbuffer to get the correct size.
+#ifndef _WIN32 // See r7388
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
#endif