diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-04-13 00:58:37 -0500 |
| commit | 605bbf5ca833399c1a6aad2a3b0e21cb4c910d11 (patch) | |
| tree | 53acc60e471e39f234af37ac56c4ce39029eb60b /Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp | |
| parent | 2444fdbbdd4310f0e012b661d258b20a4eaf4800 (diff) | |
| parent | 48927c17d252223ffdaa5cfb34aa850eb6ee6ee1 (diff) | |
Merge remote-tracking branch 'origin/master' into Android-trash
Diffstat (limited to 'Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp index 14d1aed8c0..f485cac686 100644 --- a/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Src/Debugger/MemoryView.cpp @@ -90,7 +90,7 @@ void CMemoryView::OnMouseDownL(wxMouseEvent& event) } else { - debugger->toggleMemCheck(YToAddress(y)); + debugger->toggleMemCheck(YToAddress(y)); Refresh(); Host_UpdateBreakPointView(); @@ -143,17 +143,17 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event) switch (event.GetId()) { #if wxUSE_CLIPBOARD - case IDM_COPYADDRESS: + case IDM_COPYADDRESS: wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection))); - break; - - case IDM_COPYHEX: - { - char temp[24]; - sprintf(temp, "%08x", debugger->readExtraMemory(memory, selection)); - wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp))); - } - break; + break; + + case IDM_COPYHEX: + { + char temp[24]; + sprintf(temp, "%08x", debugger->readExtraMemory(memory, selection)); + wxTheClipboard->SetData(new wxTextDataObject(StrToWxStr(temp))); + } + break; #endif case IDM_TOGGLEMEMORY: @@ -197,7 +197,7 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event) viewAsSubMenu->Append(IDM_VIEWASFP, StrToWxStr("FP value")); viewAsSubMenu->Append(IDM_VIEWASASCII, StrToWxStr("ASCII")); viewAsSubMenu->Append(IDM_VIEWASHEX, StrToWxStr("Hex")); - menu->AppendSubMenu(viewAsSubMenu, StrToWxStr("View As:")); + menu->AppendSubMenu(viewAsSubMenu, StrToWxStr("View As:")); PopupMenu(menu); } @@ -212,10 +212,10 @@ void CMemoryView::OnPaint(wxPaintEvent& event) wxCoord w,h; dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&hFont); if (h > rowHeight) - rowHeight = h; + rowHeight = h; dc.GetTextExtent(_T("0WJyq"),&w,&h,NULL,NULL,&DebuggerFont); if (h > rowHeight) - rowHeight = h; + rowHeight = h; if (viewAsType==VIEWAS_HEX) dc.SetFont(hFont); @@ -359,7 +359,9 @@ void CMemoryView::OnPaint(wxPaintEvent& event) curAddress += 32; } else + { sprintf(dis, "INVALID VIEWAS TYPE"); + } char desc[256] = ""; if (viewAsType != VIEWAS_HEX) |
