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/CodeWindow.cpp | |
| parent | 7a7aa8c5a3909727ad3bd1b3d5300b0c6ad47e46 (diff) | |
| parent | 554207a87c2e47f61d584c55ca01be3a0424606f (diff) | |
Merge pull request #376 from lioncash/wx
Wx cleanup
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/CodeWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 7f04c03d48..b8185a85cc 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -365,7 +365,7 @@ void CCodeWindow::CreateMenu(const SCoreStartupParameter& _LocalCoreStartupParam wxMenu* pCoreMenu = new wxMenu; wxMenuItem* interpreter = pCoreMenu->Append(IDM_INTERPRETER, _("&Interpreter core"), - StrToWxStr("This is necessary to get break points" + _("This is necessary to get break points" " and stepping to work as explained in the Developer Documentation. But it can be very" " slow, perhaps slower than 1 fps."), wxITEM_CHECK); @@ -433,7 +433,7 @@ void CCodeWindow::CreateMenuOptions(wxMenu* pMenu) boottopause->Check(bBootToPause); wxMenuItem* automaticstart = pMenu->Append(IDM_AUTOMATICSTART, _("&Automatic start"), - StrToWxStr( + _( "Automatically load the Default ISO when Dolphin starts, or the last game you loaded," " if you have not given it an elf file with the --elf command line. [This can be" " convenient if you are bug-testing with a certain game and want to rebuild" @@ -442,7 +442,7 @@ void CCodeWindow::CreateMenuOptions(wxMenu* pMenu) wxITEM_CHECK); automaticstart->Check(bAutomaticStart); - pMenu->Append(IDM_FONTPICKER, _("&Font..."), wxEmptyString, wxITEM_NORMAL); + pMenu->Append(IDM_FONTPICKER, _("&Font...")); } // CPU Mode and JIT Menu @@ -515,8 +515,7 @@ void CCodeWindow::OnJitMenu(wxCommandEvent& event) case IDM_SEARCHINSTRUCTION: { - wxString str; - str = wxGetTextFromUser(_T(""), wxT("Op?"), wxEmptyString, this); + wxString str = wxGetTextFromUser("", _("Op?"), wxEmptyString, this); for (u32 addr = 0x80000000; addr < 0x80100000; addr += 4) { const char *name = PPCTables::GetInstructionName(Memory::ReadUnchecked_U32(addr)); @@ -585,7 +584,7 @@ void CCodeWindow::PopulateToolbar(wxAuiToolBar* toolBar) toolBar->AddTool(IDM_GOTOPC, _("Show PC"), m_Bitmaps[Toolbar_GotoPC]); toolBar->AddTool(IDM_SETPC, _("Set PC"), m_Bitmaps[Toolbar_SetPC]); toolBar->AddSeparator(); - toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, _T(""))); + toolBar->AddControl(new wxTextCtrl(toolBar, IDM_ADDRBOX, "")); toolBar->Realize(); } @@ -612,7 +611,8 @@ void CCodeWindow::UpdateButtonStates() wxAuiToolBar* ToolBar = GetToolBar(); // Toolbar - if (!ToolBar) return; + if (!ToolBar) + return; if (!Initialized) { @@ -634,8 +634,7 @@ void CCodeWindow::UpdateButtonStates() } ToolBar->EnableTool(IDM_STEP, Initialized && Stepping); - - if (ToolBar) ToolBar->Realize(); + ToolBar->Realize(); // Menu bar // ------------------ |