From 9ed6d98e2c00f540a9d8a71c961d27d1991560d2 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 5 Jun 2010 03:03:01 +0000 Subject: [PATCH] wx 2.9 pasto and a few nits. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5617 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 2 +- Source/Core/Core/Src/CoreParameter.cpp | 2 +- Source/Core/DolphinWX/Src/Main.cpp | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index 4cfe21f4e0..9cf5bbf38f 100644 --- a/SConstruct +++ b/SConstruct @@ -1,4 +1,4 @@ -# -* python -*- +# -*- python -*- import os import sys diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp index 11953ce43f..2b152387f5 100644 --- a/Source/Core/Core/Src/CoreParameter.cpp +++ b/Source/Core/Core/Src/CoreParameter.cpp @@ -50,9 +50,9 @@ SCoreStartupParameter::SCoreStartupParameter() bWii(false), bConfirmStop(false), bHideCursor(false), bAutoHideCursor(false), bUsePanicHandlers(true), - bFullscreen(false), bRenderToMain(false), iRenderWindowXPos(0), iRenderWindowYPos(0), iRenderWindowWidth(640), iRenderWindowHeight(480), + bFullscreen(false), bRenderToMain(false), iTheme(0), iPosX(100), iPosY(100), iWidth(800), iHeight(600) { diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index be95d24bd5..09c629b678 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -189,9 +189,9 @@ bool DolphinApp::OnInit() return false; } #if wxCHECK_VERSION(2, 9, 0) - UseDebugger = parser.Found(wxT("debugger")); - UseLogger = parser.Found(wxT("logger")); - LoadElf = parser.Found(wxT("elf"), &ElfFile); + UseDebugger = parser.Found("debugger"); + UseLogger = parser.Found("logger"); + LoadElf = parser.Found("elf", &ElfFile); #else UseDebugger = parser.Found(wxT("debugger")); UseLogger = parser.Found(wxT("logger")); @@ -199,10 +199,10 @@ bool DolphinApp::OnInit() #endif #if wxCHECK_VERSION(2, 9, 0) - selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename); - selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename); - selectPadPlugin = parser.Found(wxT"pad_plugin", &padPluginFilename); - selectWiimotePlugin = parser.Found(wxT("wiimote_plugin"), &wiimotePluginFilename); + selectVideoPlugin = parser.Found("video_plugin", &videoPluginFilename); + selectAudioPlugin = parser.Found("audio_plugin", &audioPluginFilename); + selectPadPlugin = parser.Found("pad_plugin", &padPluginFilename); + selectWiimotePlugin = parser.Found("wiimote_plugin", &wiimotePluginFilename); #else selectVideoPlugin = parser.Found(wxT("video_plugin"), &videoPluginFilename); selectAudioPlugin = parser.Found(wxT("audio_plugin"), &audioPluginFilename);