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

GCC compilation fix. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4085 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-12-11 11:01:27 +00:00
parent 835127b69e
commit fe5212696d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2/gui/AppInit.cpp
View File

@ -70,7 +70,8 @@ void Pcsx2App::WipeUserModeSettings()
usermodefile.SetPath( usrlocaldir.ToString() ); usermodefile.SetPath( usrlocaldir.ToString() );
ScopedPtr<wxFileConfig> conf_usermode( OpenFileConfig( usermodefile.GetFullPath() ) ); ScopedPtr<wxFileConfig> 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.WriteLn( "(UserModeSettings) Removing entry:" );
Console.Indent().WriteLn( L"Path: %s\nHash:%s", cwd.c_str(), groupname.c_str() ); Console.Indent().WriteLn( L"Path: %s\nHash:%s", cwd.c_str(), groupname.c_str() );
conf_usermode->DeleteGroup( groupname ); conf_usermode->DeleteGroup( groupname );
@ -121,7 +122,8 @@ void Pcsx2App::ReadUserModeSettings()
usermodefile.SetPath( usrlocaldir.ToString() ); usermodefile.SetPath( usrlocaldir.ToString() );
ScopedPtr<wxFileConfig> conf_usermode( OpenFileConfig( usermodefile.GetFullPath() ) ); ScopedPtr<wxFileConfig> 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 hasGroup = conf_usermode->HasGroup( groupname );
bool forceWiz = Startup.ForceWizard || !hasGroup; bool forceWiz = Startup.ForceWizard || !hasGroup;
@ -549,8 +551,7 @@ bool Pcsx2App::OnInit()
wxInitAllImageHandlers(); wxInitAllImageHandlers();
Console.WriteLn("Applying operating system default language..."); Console.WriteLn("Applying operating system default language...");
//i18n_SetLanguage( wxLANGUAGE_DEFAULT ); i18n_SetLanguage( wxLANGUAGE_DEFAULT );
i18n_SetLanguage( wxLANGUAGE_CHINESE );
Console.WriteLn("Command line parsing..."); Console.WriteLn("Command line parsing...");
if( !_parent::OnInit() ) return false; if( !_parent::OnInit() ) return false;