mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-24 21:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OS X also needs to have the display resolution changed before

Browse Source 
setting wxFULLSCREEN_ALL.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7390 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2011-03-21 16:06:40 +00:00
parent 7f5da62d1c
commit d332cc342d
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Externals/wxWidgets3/SConscript vendored
View File

@ -6,9 +6,6 @@ import sys
if env['nowx']: if env['nowx']:
Return() Return()
if env.has_key('HAVE_WX') and env['HAVE_WX']:
Return()
env['CPPPATH'] += ['#Externals/wxWidgets3', '#Externals/wxWidgets3/include'] env['CPPPATH'] += ['#Externals/wxWidgets3', '#Externals/wxWidgets3/include']
wxenv = env.Clone() wxenv = env.Clone()

8
SConstruct
View File

@ -199,12 +199,14 @@ else:
env['CPPPATH'] += ['/usr/local/include/glib-2.0'] env['CPPPATH'] += ['/usr/local/include/glib-2.0']
env['CPPPATH'] += ['/usr/local/include/gtk-2.0'] env['CPPPATH'] += ['/usr/local/include/gtk-2.0']
env['CPPPATH'] += ['/usr/local/include/pango-1.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) 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'])) 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'])) conf.Define('HAVE_ALSA', int(env['HAVE_ALSA']))
env['HAVE_AO'] = conf.CheckLib('ao') env['HAVE_AO'] = conf.CheckLib('ao')
conf.Define('HAVE_AO', int(env['HAVE_AO'])) conf.Define('HAVE_AO', int(env['HAVE_AO']))
@ -212,7 +214,7 @@ else:
conf.Define('HAVE_OPENAL', int(env['HAVE_OPENAL'])) conf.Define('HAVE_OPENAL', int(env['HAVE_OPENAL']))
env['HAVE_PORTAUDIO'] = conf.CheckLib('portaudio') env['HAVE_PORTAUDIO'] = conf.CheckLib('portaudio')
conf.Define('HAVE_PORTAUDIO', int(env['HAVE_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'])) conf.Define('HAVE_PULSEAUDIO', int(env['HAVE_PULSEAUDIO']))
env['HAVE_X11'] = conf.CheckLib('X11') env['HAVE_X11'] = conf.CheckLib('X11')

6
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -991,13 +991,11 @@ void CFrame::OnMouse(wxMouseEvent& event)
void CFrame::DoFullscreen(bool bF) void CFrame::DoFullscreen(bool bF)
{ {
#ifndef __linux__ #ifdef _WIN32 // See r7388
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
#endif #endif
ToggleDisplayMode(bF); ToggleDisplayMode(bF);
#ifdef __linux__ #ifndef _WIN32 // See r7388
// 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.
m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL); m_RenderFrame->ShowFullScreen(bF, wxFULLSCREEN_ALL);
#endif #endif