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

first time I had to remove wxT() to make it compile:) 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1481 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-10 09:57:15 +00:00
parent 6b6aa1bb17
commit f82ee1faa6
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -125,9 +125,9 @@ CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString
{ {
memoryCard[SLOT_A]=NULL; memoryCard[SLOT_A]=NULL;
memoryCard[SLOT_B]=NULL; memoryCard[SLOT_B]=NULL;
if (MemcardManagerIni.Load(wxT(CONFIG_FILE))) if (MemcardManagerIni.Load(CONFIG_FILE))
{ {
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("Items per page"), &itemsPerPage, 16); MemcardManagerIni.Get("MemcardManager", "Items per page", &itemsPerPage, 16);
} }
else itemsPerPage = 16; else itemsPerPage = 16;
maxPages = (128 / itemsPerPage) - 1; maxPages = (128 / itemsPerPage) - 1;
@ -146,23 +146,23 @@ CMemcardManager::~CMemcardManager()
delete memoryCard[SLOT_B]; delete memoryCard[SLOT_B];
memoryCard[SLOT_B] = NULL; memoryCard[SLOT_B] = NULL;
} }
MemcardManagerIni.Load(wxT(CONFIG_FILE)); MemcardManagerIni.Load(CONFIG_FILE);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("Items per page"), itemsPerPage); MemcardManagerIni.Set("MemcardManager", "Items per page", itemsPerPage);
MemcardManagerIni.Save(wxT(CONFIG_FILE)); MemcardManagerIni.Save(CONFIG_FILE);
} }
CMemcardManager::CMemcardListCtrl::CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style) CMemcardManager::CMemcardListCtrl::CMemcardListCtrl(wxWindow* parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
: wxListCtrl(parent, id, pos, size, style) : wxListCtrl(parent, id, pos, size, style)
{ {
if (MemcardManagerIni.Load(wxT(CONFIG_FILE))) if (MemcardManagerIni.Load(CONFIG_FILE))
{ {
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("Use Pages"), &usePages, true); MemcardManagerIni.Get("MemcardManager", "Use Pages", &usePages, true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cBanner"), &column[COLUMN_BANNER], true); MemcardManagerIni.Get("MemcardManager", "cBanner", &column[COLUMN_BANNER], true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cTitle"), &column[COLUMN_TITLE], true); MemcardManagerIni.Get("MemcardManager", "cTitle", &column[COLUMN_TITLE], true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cComment"), &column[COLUMN_COMMENT], true); MemcardManagerIni.Get("MemcardManager", "cComment", &column[COLUMN_COMMENT], true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cBlocks"), &column[COLUMN_BLOCKS], true); MemcardManagerIni.Get("MemcardManager", "cBlocks", &column[COLUMN_BLOCKS], true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cBanner"), &column[COLUMN_BANNER], true); MemcardManagerIni.Get("MemcardManager", "cBanner", &column[COLUMN_BANNER], true);
MemcardManagerIni.Get(wxT("MemcardManager"), wxT("cFirst Block"), &column[COLUMN_FIRSTBLOCK], true); MemcardManagerIni.Get("MemcardManager", "cFirst Block", &column[COLUMN_FIRSTBLOCK], true);
} }
else else
{ {
@ -177,15 +177,15 @@ CMemcardManager::CMemcardListCtrl::CMemcardListCtrl(wxWindow* parent, const wxWi
CMemcardManager::CMemcardListCtrl::~CMemcardListCtrl() CMemcardManager::CMemcardListCtrl::~CMemcardListCtrl()
{ {
MemcardManagerIni.Load(wxT(CONFIG_FILE)); MemcardManagerIni.Load(CONFIG_FILE);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("Use Pages"), usePages); MemcardManagerIni.Set("MemcardManager", "Use Pages", usePages);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cBanner"), column[COLUMN_BANNER]); MemcardManagerIni.Set("MemcardManager", "cBanner", column[COLUMN_BANNER]);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cTitle"), column[COLUMN_TITLE]); MemcardManagerIni.Set("MemcardManager", "cTitle", column[COLUMN_TITLE]);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cComment"), column[COLUMN_COMMENT]); MemcardManagerIni.Set("MemcardManager", "cComment", column[COLUMN_COMMENT]);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cBlocks"), column[COLUMN_BLOCKS]); MemcardManagerIni.Set("MemcardManager", "cBlocks", column[COLUMN_BLOCKS]);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cBanner"), column[COLUMN_BANNER]); MemcardManagerIni.Set("MemcardManager", "cBanner", column[COLUMN_BANNER]);
MemcardManagerIni.Set(wxT("MemcardManager"), wxT("cFirst Block"), column[COLUMN_FIRSTBLOCK]); MemcardManagerIni.Set("MemcardManager", "cFirst Block", column[COLUMN_FIRSTBLOCK]);
MemcardManagerIni.Save(wxT(CONFIG_FILE)); MemcardManagerIni.Save(CONFIG_FILE);
} }
void CMemcardManager::CreateGUIControls() void CMemcardManager::CreateGUIControls()