From e4085f0f049c0f681e3feaa97f7f0842c017ae8e Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 3 Jun 2010 04:55:39 +0000 Subject: Merge GCPadNew into Dolphin. This takes place in three segments: Core, InputCommon, and InputUICommon. From now on it can be referred to just as "GCPad". Switch to Billiard's IniFile implementation throughout Dolphin (it's faster!!). git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5579 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DebuggerWX/Src/MemoryWindow.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'Source/Core/DebuggerWX/Src/MemoryWindow.cpp') diff --git a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp index 61e0468fe0..d24701975a 100644 --- a/Source/Core/DebuggerWX/Src/MemoryWindow.cpp +++ b/Source/Core/DebuggerWX/Src/MemoryWindow.cpp @@ -129,21 +129,23 @@ void CMemoryWindow::Save(IniFile& _IniFile) const // Prevent these bad values that can happen after a crash or hanging if(GetPosition().x != -32000 && GetPosition().y != -32000) { - _IniFile.Set("MemoryWindow", "x", GetPosition().x); - _IniFile.Set("MemoryWindow", "y", GetPosition().y); - _IniFile.Set("MemoryWindow", "w", GetSize().GetWidth()); - _IniFile.Set("MemoryWindow", "h", GetSize().GetHeight()); + Section& memwin = _IniFile["MemoryWindow"]; + memwin.Set("x", GetPosition().x); + memwin.Set("y", GetPosition().y); + memwin.Set("w", GetSize().GetWidth()); + memwin.Set("h", GetSize().GetHeight()); } } void CMemoryWindow::Load(IniFile& _IniFile) { - int x,y,w,h; - _IniFile.Get("MemoryWindow", "x", &x, GetPosition().x); - _IniFile.Get("MemoryWindow", "y", &y, GetPosition().y); - _IniFile.Get("MemoryWindow", "w", &w, GetSize().GetWidth()); - _IniFile.Get("MemoryWindow", "h", &h, GetSize().GetHeight()); + int x, y, w, h; + Section& memwin = _IniFile["MemoryWindow"]; + memwin.Get("x", &x, GetPosition().x); + memwin.Get("y", &y, GetPosition().y); + memwin.Get("w", &w, GetSize().GetWidth()); + memwin.Get("h", &h, GetSize().GetHeight()); SetSize(x, y, w, h); } @@ -322,12 +324,12 @@ void CMemoryWindow::onSearch(wxCommandEvent& event) { //memview->cu wxString rawData=valbox->GetValue(); std::vector Dest;//May need a better name - u32 size=0; + size_t size=0; int pad=rawData.size()%2;//If it's uneven unsigned long i=0; long count=0; char copy[3]={0}; - long newsize=0; + size_t newsize=0; unsigned char *tmp2=0; char* tmpstr=0; switch (chkHex->GetValue()){ -- cgit v1.2.3