Merge pull request #46 from krofna

This commit is contained in:
Alexandro Sánchez Bach 2014-02-21 17:13:57 +01:00
parent 17b877e448
commit e7a721a1fb
15 changed files with 60 additions and 18 deletions

View file

@ -1,7 +1,9 @@
#include "stdafx.h"
#include "Ini.h"
#ifdef _WIN32
#include <wx/msw/iniconf.h>
#endif
Inis Ini;
@ -148,9 +150,13 @@ static wxString WindowInfoToString(const WindowInfo wind)
//Ini
Ini::Ini()
{
#ifdef _WIN32
m_Config = new wxIniConfig( wxEmptyString, wxEmptyString,
wxGetCwd() + "\\rpcs3.ini",
wxEmptyString, wxCONFIG_USE_LOCAL_FILE );
#else
m_Config = new wxConfig("rpcs3");
#endif
}
void Ini::Save(wxString key, int value)
@ -211,4 +217,4 @@ wxString Ini::Load(wxString key, const wxString& def_value)
WindowInfo Ini::Load(wxString key, const WindowInfo& def_value)
{
return StringToWindowInfo(m_Config->Read(key, WindowInfoToString(def_value)));
}
}