ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wx 2.9 pasto and a few nits. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5617 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-05 03:03:01 +00:00
parent eb6fabdb00
commit 9ed6d98e2c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -1,4 +1,4 @@
# -* python -*- # -*- python -*-
import os import os
import sys import sys

2
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -50,9 +50,9 @@ SCoreStartupParameter::SCoreStartupParameter()
bWii(false), bWii(false),
bConfirmStop(false), bHideCursor(false), bConfirmStop(false), bHideCursor(false),
bAutoHideCursor(false), bUsePanicHandlers(true), bAutoHideCursor(false), bUsePanicHandlers(true),
bFullscreen(false), bRenderToMain(false),
iRenderWindowXPos(0), iRenderWindowYPos(0), iRenderWindowXPos(0), iRenderWindowYPos(0),
iRenderWindowWidth(640), iRenderWindowHeight(480), iRenderWindowWidth(640), iRenderWindowHeight(480),
bFullscreen(false), bRenderToMain(false),
iTheme(0), iTheme(0),
iPosX(100), iPosY(100), iWidth(800), iHeight(600) iPosX(100), iPosY(100), iWidth(800), iHeight(600)
{ {

14
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -189,9 +189,9 @@ bool DolphinApp::OnInit()
return false; return false;
} }
#if wxCHECK_VERSION(2, 9, 0) #if wxCHECK_VERSION(2, 9, 0)
UseDebugger = parser.Found(wxT("debugger")); UseDebugger = parser.Found("debugger");
UseLogger = parser.Found(wxT("logger")); UseLogger = parser.Found("logger");
LoadElf = parser.Found(wxT("elf"), &ElfFile); LoadElf = parser.Found("elf", &ElfFile);
#else #else
UseDebugger = parser.Found(wxT("debugger")); UseDebugger = parser.Found(wxT("debugger"));
UseLogger = parser.Found(wxT("logger")); UseLogger = parser.Found(wxT("logger"));
@ -199,10 +199,10 @@ bool DolphinApp::OnInit()
#endif #endif
#if wxCHECK_VERSION(2, 9, 0) #if wxCHECK_VERSION(2, 9, 0)
selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename); selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename);
selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename); selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename);
selectPadPlugin = parser.Found(wxT"pad_plugin", &padPluginFilename); selectPadPlugin = parser.Found("pad_plugin", &padPluginFilename);
selectWiimotePlugin = parser.Found(wxT("wiimote_plugin"), &wiimotePluginFilename); selectWiimotePlugin = parser.Found("wiimote_plugin", &wiimotePluginFilename);
#else #else
selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename); selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename);
selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename); selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename);