From d332cc342df2d960fb7e44b8c1c090212a72bb01 Mon Sep 17 00:00:00 2001
From: Soren Jorvang <soren.jorvang@gmail.com>
Date: Mon, 21 Mar 2011 16:06:40 +0000
Subject: [PATCH] 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
---
 Externals/wxWidgets3/SConscript     | 3 ---
 SConstruct                          | 8 +++++---
 Source/Core/DolphinWX/Src/Frame.cpp | 6 ++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Externals/wxWidgets3/SConscript b/Externals/wxWidgets3/SConscript
index 7342a6458a..a2ac5fba0f 100644
--- a/Externals/wxWidgets3/SConscript
+++ b/Externals/wxWidgets3/SConscript
@@ -6,9 +6,6 @@ import sys
 if env['nowx']:
 	Return()
 
-if env.has_key('HAVE_WX') and env['HAVE_WX']:
-	Return()
-
 env['CPPPATH'] += ['#Externals/wxWidgets3', '#Externals/wxWidgets3/include']
 
 wxenv = env.Clone()
diff --git a/SConstruct b/SConstruct
index 767074a93b..773b291a26 100755
--- a/SConstruct
+++ b/SConstruct
@@ -199,12 +199,14 @@ else:
         env['CPPPATH'] += ['/usr/local/include/glib-2.0']
         env['CPPPATH'] += ['/usr/local/include/gtk-2.0']
         env['CPPPATH'] += ['/usr/local/include/pango-1.0']
+        env['CPPPATH'] += ['/usr/lib/glib-2.0/include']
+        env['CPPPATH'] += ['/usr/lib/gtk-2.0/include']
         conf.Define('HAVE_WX', 1)
 
-    env['HAVE_BLUEZ'] = conf.CheckLib('bluez')
+    env['HAVE_BLUEZ'] = conf.CheckLib('bluetooth')
     conf.Define('HAVE_BLUEZ', int(env['HAVE_BLUEZ']))
 
-    env['HAVE_ALSA'] = conf.CheckLib('alsa')
+    env['HAVE_ALSA'] = conf.CheckLib('asound')
     conf.Define('HAVE_ALSA', int(env['HAVE_ALSA']))
     env['HAVE_AO'] = conf.CheckLib('ao')
     conf.Define('HAVE_AO', int(env['HAVE_AO']))
@@ -212,7 +214,7 @@ else:
     conf.Define('HAVE_OPENAL', int(env['HAVE_OPENAL']))
     env['HAVE_PORTAUDIO'] = conf.CheckLib('portaudio')
     conf.Define('HAVE_PORTAUDIO', int(env['HAVE_PORTAUDIO']))
-    env['HAVE_PULSEAUDIO'] = conf.CheckLib('libpulse')
+    env['HAVE_PULSEAUDIO'] = conf.CheckLib('pulse')
     conf.Define('HAVE_PULSEAUDIO', int(env['HAVE_PULSEAUDIO']))
 
     env['HAVE_X11'] = conf.CheckLib('X11')
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