From fe5212696d5cf54516e1de89b1634bacec771d85 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sat, 11 Dec 2010 11:01:27 +0000 Subject: [PATCH] GCC compilation fix. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4085 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppInit.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 43f221600d..952d28882a 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -70,7 +70,8 @@ void Pcsx2App::WipeUserModeSettings() usermodefile.SetPath( usrlocaldir.ToString() ); ScopedPtr conf_usermode( OpenFileConfig( usermodefile.GetFullPath() ) ); - wxString groupname( pxsFmt( L"CWD.%08x", hashres ) ); + FastFormatUnicode groupname; + groupname.Write( L"CWD.%08x", hashres ); Console.WriteLn( "(UserModeSettings) Removing entry:" ); Console.Indent().WriteLn( L"Path: %s\nHash:%s", cwd.c_str(), groupname.c_str() ); conf_usermode->DeleteGroup( groupname ); @@ -121,7 +122,8 @@ void Pcsx2App::ReadUserModeSettings() usermodefile.SetPath( usrlocaldir.ToString() ); ScopedPtr conf_usermode( OpenFileConfig( usermodefile.GetFullPath() ) ); - wxString groupname( wxsFormat( L"CWD.%08x", hashres ) ); + FastFormatUnicode groupname; + groupname.Write( L"CWD.%08x", hashres ); bool hasGroup = conf_usermode->HasGroup( groupname ); bool forceWiz = Startup.ForceWizard || !hasGroup; @@ -549,8 +551,7 @@ bool Pcsx2App::OnInit() wxInitAllImageHandlers(); Console.WriteLn("Applying operating system default language..."); - //i18n_SetLanguage( wxLANGUAGE_DEFAULT ); - i18n_SetLanguage( wxLANGUAGE_CHINESE ); + i18n_SetLanguage( wxLANGUAGE_DEFAULT ); Console.WriteLn("Command line parsing..."); if( !_parent::OnInit() ) return false;