diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-21 21:54:00 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-21 21:54:00 -0700 |
| commit | c3086577798c81cacb39133a666fafd1f52160ce (patch) | |
| tree | cd80c68ebef6ab7ea8db0a66bfd13504df82108c /Source/Core/DolphinWX/Debugger/JitWindow.cpp | |
| parent | 7a7aa8c5a3909727ad3bd1b3d5300b0c6ad47e46 (diff) | |
| parent | 554207a87c2e47f61d584c55ca01be3a0424606f (diff) | |
Merge pull request #376 from lioncash/wx
Wx cleanup
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/JitWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/JitWindow.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/DolphinWX/Debugger/JitWindow.cpp b/Source/Core/DolphinWX/Debugger/JitWindow.cpp index 5b13419f0d..47a153a063 100644 --- a/Source/Core/DolphinWX/Debugger/JitWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/JitWindow.cpp @@ -54,9 +54,9 @@ CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos, { wxBoxSizer* sizerBig = new wxBoxSizer(wxVERTICAL); wxBoxSizer* sizerSplit = new wxBoxSizer(wxHORIZONTAL); - sizerSplit->Add(ppc_box = new wxTextCtrl(this, IDM_PPC_BOX, _T("(ppc)"), + sizerSplit->Add(ppc_box = new wxTextCtrl(this, IDM_PPC_BOX, "(ppc)", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND); - sizerSplit->Add(x86_box = new wxTextCtrl(this, IDM_X86_BOX, _T("(x86)"), + sizerSplit->Add(x86_box = new wxTextCtrl(this, IDM_X86_BOX, "(x86)", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE), 1, wxEXPAND); sizerBig->Add(block_list = new JitBlockList(this, IDM_BLOCKLIST, wxDefaultPosition, wxSize(100, 140), @@ -66,7 +66,7 @@ CJitWindow::CJitWindow(wxWindow* parent, wxWindowID id, const wxPoint& pos, // sizerBig->Add(memview, 5, wxEXPAND); // sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3); sizerBig->Add(button_refresh = new wxButton(this, IDM_REFRESH_LIST, _("&Refresh"))); - // sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, _T(""))); + // sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_ADDRBOX, "")); // sizerRight->Add(new wxButton(this, IDM_SETPC, _("S&et PC"))); SetSizer(sizerBig); @@ -115,9 +115,8 @@ void CJitWindow::Compare(u32 em_address) // Do not merge this "if" with the above - block_num changes inside it. if (block_num < 0) { - ppc_box->SetValue(StrToWxStr(StringFromFormat("(non-code address: %08x)", - em_address))); - x86_box->SetValue(StrToWxStr(StringFromFormat("(no translation)"))); + ppc_box->SetValue(_(StringFromFormat("(non-code address: %08x)", em_address))); + x86_box->SetValue(_("(no translation)")); delete[] xDis; return; } @@ -178,7 +177,7 @@ void CJitWindow::Compare(u32 em_address) if (st.isFirstBlockOfFunction) sptr += sprintf(sptr, "(first block of function)\n"); if (st.isLastBlockOfFunction) - sptr += sprintf(sptr, "(first block of function)\n"); + sptr += sprintf(sptr, "(last block of function)\n"); sptr += sprintf(sptr, "%i estimated cycles\n", st.numCycles); |