Merge pull request #376 from lioncash/wx

Wx cleanup

Source/Core/DolphinWX/ARCodeAddEdit.cpp

@@ -182,7 +182,7 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode)
 	if (arCode.name != "")
 	{
 		for (auto& op : arCode.ops)
-			EditCheatCode->AppendText(wxString::Format(wxT("%08X %08X\n"), op.cmd_addr, op.value));
+			EditCheatCode->AppendText(wxString::Format("%08X %08X\n", op.cmd_addr, op.value));
 	}
 	else
 	{

Source/Core/DolphinWX/CheatsWindow.cpp

@@ -88,8 +88,8 @@ void wxCheatsWindow::Init_ChildControls()
 	m_Tab_Cheats = new wxPanel(m_Notebook_Main, wxID_ANY);
 
 	m_CheckListBox_CheatsList = new wxCheckListBox(m_Tab_Cheats, wxID_ANY, wxDefaultPosition, wxSize(300, 0), m_CheatStringList, wxLB_HSCROLL, wxDefaultValidator);
-	m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this);
-	m_CheckListBox_CheatsList->Bind(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this);
+	m_CheckListBox_CheatsList->Bind(wxEVT_LISTBOX, &wxCheatsWindow::OnEvent_CheatsList_ItemSelected, this);
+	m_CheckListBox_CheatsList->Bind(wxEVT_CHECKLISTBOX, &wxCheatsWindow::OnEvent_CheatsList_ItemToggled, this);
 
 	m_Label_Codename = new wxStaticText(m_Tab_Cheats, wxID_ANY, _("Name: "));
 	m_GroupBox_Info = new wxStaticBox(m_Tab_Cheats, wxID_ANY, _("Code Info"));
@@ -115,13 +115,13 @@ void wxCheatsWindow::Init_ChildControls()
 	m_Tab_Log = new wxPanel(m_Notebook_Main, wxID_ANY);
 
 	wxButton* const button_updatelog = new wxButton(m_Tab_Log, wxID_ANY, _("Update"));
-	button_updatelog->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this);
+	button_updatelog->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonUpdateLog_Press, this);
 
 	m_CheckBox_LogAR = new wxCheckBox(m_Tab_Log, wxID_ANY, _("Enable AR Logging"));
-	m_CheckBox_LogAR->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this);
+	m_CheckBox_LogAR->Bind(wxEVT_CHECKBOX, &wxCheatsWindow::OnEvent_CheckBoxEnableLogging_StateChange, this);
 
 	m_CheckBox_LogAR->SetValue(ActionReplay::IsSelfLogging());
-	m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
+	m_TextCtrl_Log = new wxTextCtrl(m_Tab_Log, wxID_ANY, "", wxDefaultPosition, wxSize(100, -1), wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
 
 	wxBoxSizer *HStrip1 = new wxBoxSizer(wxHORIZONTAL);
 	HStrip1->Add(m_CheckBox_LogAR, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
@@ -142,9 +142,9 @@ void wxCheatsWindow::Init_ChildControls()
 
 	// Button Strip
 	button_apply = new wxButton(panel, wxID_APPLY, _("Apply"));
-	button_apply->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
+	button_apply->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ApplyChanges_Press, this);
 	wxButton* const button_cancel = new wxButton(panel, wxID_CANCEL, _("Cancel"));
-	button_cancel->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
+	button_cancel->Bind(wxEVT_BUTTON, &wxCheatsWindow::OnEvent_ButtonClose_Press, this);
 
 	Bind(wxEVT_CLOSE_WINDOW, &wxCheatsWindow::OnEvent_Close, this);
 
@@ -168,11 +168,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 {
 	// first scan button
 	btnInitScan = new wxButton(this, -1, _("New Scan"));
-	btnInitScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::StartNewSearch, this);
+	btnInitScan->Bind(wxEVT_BUTTON, &CheatSearchTab::StartNewSearch, this);
 
 	// next scan button
 	btnNextScan = new wxButton(this, -1, _("Next Scan"));
-	btnNextScan->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::FilterCheatSearchResults, this);
+	btnNextScan->Bind(wxEVT_BUTTON, &CheatSearchTab::FilterCheatSearchResults, this);
 	btnNextScan->Disable();
 
 	// data size radio buttons
@@ -193,7 +193,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 
 	// create AR code button
 	wxButton* const button_cheat_search_copy_address = new wxButton(this, -1, _("Create AR Code"));
-	button_cheat_search_copy_address->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CheatSearchTab::CreateARCode, this);
+	button_cheat_search_copy_address->Bind(wxEVT_BUTTON, &CheatSearchTab::CreateARCode, this);
 
 	// results groupbox
 	wxStaticBoxSizer* const sizer_cheat_search_results = new wxStaticBoxSizer(wxVERTICAL, this, _("Results"));
@@ -203,11 +203,11 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
 
 	// Search value radio buttons
 	value_x_radiobtn.rad_oldvalue = new wxRadioButton(this, -1, _("Previous Value"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-	value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, wxT(""));
+	value_x_radiobtn.rad_uservalue = new wxRadioButton(this, -1, "");
 	value_x_radiobtn.rad_oldvalue->SetValue(true);
 
 	// search value textbox
-	textctrl_value_x = new wxTextCtrl(this, -1, wxT("0x0"), wxDefaultPosition, wxSize(96,-1));
+	textctrl_value_x = new wxTextCtrl(this, -1, "0x0", wxDefaultPosition, wxSize(96,-1));
 	textctrl_value_x->Bind(wxEVT_SET_FOCUS, &CheatSearchTab::ApplyFocus, this);
 
 	wxBoxSizer* const sizer_cheat_filter_text = new wxBoxSizer(wxHORIZONTAL);
@@ -539,7 +539,7 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
 {
 	lbox_search_results->Clear();
 
-	wxString count_label = _("Count:") + wxString::Format(wxT(" %lu"),
+	wxString count_label = _("Count:") + wxString::Format(" %lu",
 		(unsigned long)search_results.size());
 	if (search_results.size() > MAX_CHEAT_SEARCH_RESULTS_DISPLAY)
 	{
@@ -566,12 +566,10 @@ void CheatSearchTab::UpdateCheatSearchResultsList()
 			// #elseif BIG_ENDIAN
 			// need to do some stuff in here (for 8 and 16bit) for bigendian
 			// #endif
-
-			static wxChar rowfmt[] = wxT("0x%08x    0x%0|x    %u/%i");
-			rowfmt[14] = (wxChar)(wxT('0') + search_type_size*2);
+			std::string rowfmt = StringFromFormat("0x%%08x    0x%%0%ux    %%u/%%i", search_type_size*2);
 
 			lbox_search_results->Append(
-				wxString::Format(rowfmt, result.address, display_value, display_value, display_value));
+				wxString::Format(rowfmt.c_str(), result.address, display_value, display_value, display_value));
 		}
 	}
 
@@ -598,11 +596,11 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
 	textctrl_name = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(256,-1));
 
 	wxStaticText* const label_code = new wxStaticText(this, -1, _("Code: "));
-	textctrl_code = new wxTextCtrl(this, -1, wxString::Format(wxT("0x%08x"), address));
+	textctrl_code = new wxTextCtrl(this, -1, wxString::Format("0x%08x", address));
 	textctrl_code->Disable();
 
 	wxStaticText* const label_value = new wxStaticText(this, -1, _("Value: "));
-	textctrl_value = new wxTextCtrl(this, -1, wxT("0"));
+	textctrl_value = new wxTextCtrl(this, -1, "0");
 
 	checkbox_use_hex = new wxCheckBox(this, -1, _("Use Hex"));
 	checkbox_use_hex->SetValue(true);
@@ -621,8 +619,8 @@ CreateCodeDialog::CreateCodeDialog(wxWindow* const parent, const u32 address)
 	sizer_main->Add(textctrl_value, 0, wxALL, 5);
 	sizer_main->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxALL, 5);
 
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressOK, this, wxID_OK);
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &CreateCodeDialog::PressCancel, this, wxID_CANCEL);
+	Bind(wxEVT_BUTTON, &CreateCodeDialog::PressOK, this, wxID_OK);
+	Bind(wxEVT_BUTTON, &CreateCodeDialog::PressCancel, this, wxID_CANCEL);
 	Bind(wxEVT_CLOSE_WINDOW, &CreateCodeDialog::OnEvent_Close, this);
 
 	SetSizerAndFit(sizer_main);
@@ -647,8 +645,8 @@ void CreateCodeDialog::PressOK(wxCommandEvent& ev)
 	}
 
 	//wxString full_code = textctrl_code->GetValue();
-	//full_code += wxT(' ');
-	//full_code += wxString::Format(wxT("0x%08x"), code_value);
+	//full_code += ' ';
+	//full_code += wxString::Format("0x%08x", code_value);
 
 	// create the new code
 	ActionReplay::ARCode new_cheat;

Source/Core/DolphinWX/ConfigMain.cpp

@@ -121,7 +121,6 @@ static const wxLanguage langIds[] =
 #define EXIDEV_AM_BB_STR    _trans("AM-Baseboard")
 #define EXIDEV_GECKO_STR    "USBGecko"
 
-#define WXSTR_TRANS(a)      wxString(wxGetTranslation(wxT(a)))
 #ifdef WIN32
 //only used with xgettext to be picked up as translatable string.
 //win32 does not have wx on its path, the provided wxALL_FILES
@@ -268,7 +267,7 @@ void CConfigMain::InitializeGUILists()
 	arrayStringFor_Framelimit.Add(_("Auto"));
 	arrayStringFor_Framelimit.Add(_("Audio"));
 	for (int i = 10; i <= 120; i += 5) // from 10 to 120
-		arrayStringFor_Framelimit.Add(wxString::Format(wxT("%i"), i));
+		arrayStringFor_Framelimit.Add(wxString::Format("%i", i));
 
 	// Emulator Engine
 	for (const CPUCore& CPUCores_a : CPUCores)
@@ -295,8 +294,8 @@ void CConfigMain::InitializeGUILists()
 	arrayStringFor_WiiSensBarPos.Add(_("Top"));
 
 	// Aspect ratio
-	arrayStringFor_WiiAspectRatio.Add(wxT("4:3"));
-	arrayStringFor_WiiAspectRatio.Add(wxT("16:9"));
+	arrayStringFor_WiiAspectRatio.Add("4:3");
+	arrayStringFor_WiiAspectRatio.Add("16:9");
 
 	// Wii Language arrayStrings
 	arrayStringFor_WiiSystemLang = arrayStringFor_GCSystemLang;
@@ -375,7 +374,7 @@ void CConfigMain::InitializeGUIValues()
 	// Audio
 	VolumeSlider->Enable(SupportsVolumeChanges(SConfig::GetInstance().sBackend));
 	VolumeSlider->SetValue(SConfig::GetInstance().m_Volume);
-	VolumeText->SetLabel(wxString::Format(wxT("%d %%"), SConfig::GetInstance().m_Volume));
+	VolumeText->SetLabel(wxString::Format("%d %%", SConfig::GetInstance().m_Volume));
 	DSPThread->SetValue(startup_params.bDSPThread);
 	DumpAudio->SetValue(SConfig::GetInstance().m_DumpAudio ? true : false);
 	DPL2Decoder->Enable(std::string(SConfig::GetInstance().sBackend) == BACKEND_OPENAL);
@@ -629,7 +628,7 @@ void CConfigMain::CreateGUIControls()
 	theme_selection->SetStringSelection(StrToWxStr(SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name));
 
 	// std::function = avoid error on msvc
-	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
+	theme_selection->Bind(wxEVT_CHOICE, std::function<void(wxEvent&)>([theme_selection](wxEvent&)
 	{
 		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = WxStrToStr(theme_selection->GetStringSelection());
 		main_frame->InitBitmaps();
@@ -658,11 +657,11 @@ void CConfigMain::CreateGUIControls()
 	DumpAudio = new wxCheckBox(AudioPage, ID_DUMP_AUDIO, _("Dump Audio"));
 	DPL2Decoder = new wxCheckBox(AudioPage, ID_DPL2DECODER, _("Dolby Pro Logic II decoder"));
 	VolumeSlider = new wxSlider(AudioPage, ID_VOLUME, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE);
-	VolumeText = new wxStaticText(AudioPage, wxID_ANY, wxT(""));
+	VolumeText = new wxStaticText(AudioPage, wxID_ANY, "");
 	BackendSelection = new wxChoice(AudioPage, ID_BACKEND, wxDefaultPosition, wxDefaultSize, wxArrayBackends, 0, wxDefaultValidator, wxEmptyString);
 	Latency = new wxSpinCtrl(AudioPage, ID_LATENCY, "", wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 30);
 
-	Latency->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &CConfigMain::AudioSettingsChanged, this);
+	Latency->Bind(wxEVT_SPINCTRL, &CConfigMain::AudioSettingsChanged, this);
 
 	if (Core::GetState() != Core::CORE_UNINITIALIZED)
 	{
@@ -709,13 +708,13 @@ void CConfigMain::CreateGUIControls()
 	wxStaticText* GCEXIDeviceText[3];
 	GCEXIDeviceText[0] = TEXT_BOX(GamecubePage, _("Slot A"));
 	GCEXIDeviceText[1] = TEXT_BOX(GamecubePage, _("Slot B"));
-	GCEXIDeviceText[2] = TEXT_BOX(GamecubePage, wxT("SP1"));
+	GCEXIDeviceText[2] = TEXT_BOX(GamecubePage, "SP1");
 	GCEXIDevice[0] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTA);
 	GCEXIDevice[1] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SLOTB);
 	GCEXIDevice[2] = new wxChoice(GamecubePage, ID_GC_EXIDEVICE_SP1);
-	GCMemcardPath[0] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTA_PATH, wxT("..."),
+	GCMemcardPath[0] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTA_PATH, "...",
 			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
-	GCMemcardPath[1] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTB_PATH, wxT("..."),
+	GCMemcardPath[1] = new wxButton(GamecubePage, ID_GC_EXIDEVICE_SLOTB_PATH, "...",
 			wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT);
 
 	//SI Devices
@@ -810,11 +809,11 @@ void CConfigMain::CreateGUIControls()
 	RemoveISOPath->Enable(false);
 
 	DefaultISO = new wxFilePickerCtrl(PathsPage, ID_DEFAULTISO, wxEmptyString, _("Choose a default ISO:"),
-		_("All GC/Wii images (gcm, iso, wbfs, ciso, gcz)") + wxString::Format(wxT("|*.gcm;*.iso;*.wbfs;*.ciso;*.gcz|%s"), wxGetTranslation(wxALL_FILES)),
+		_("All GC/Wii images (gcm, iso, wbfs, ciso, gcz)") + wxString::Format("|*.gcm;*.iso;*.wbfs;*.ciso;*.gcz|%s", wxGetTranslation(wxALL_FILES)),
 		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
 	DVDRoot = new wxDirPickerCtrl(PathsPage, ID_DVDROOT, wxEmptyString, _("Choose a DVD root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
 	ApploaderPath = new wxFilePickerCtrl(PathsPage, ID_APPLOADERPATH, wxEmptyString, _("Choose file to use as apploader: (applies to discs constructed from directories only)"),
-		_("apploader (.img)") + wxString::Format(wxT("|*.img|%s"), wxGetTranslation(wxALL_FILES)),
+		_("apploader (.img)") + wxString::Format("|*.img|%s", wxGetTranslation(wxALL_FILES)),
 		wxDefaultPosition, wxDefaultSize, wxFLP_USE_TEXTCTRL|wxFLP_OPEN);
 	NANDRoot = new wxDirPickerCtrl(PathsPage, ID_NANDROOT, wxEmptyString, _("Choose a NAND root directory:"), wxDefaultPosition, wxDefaultSize, wxDIRP_USE_TEXTCTRL);
 
@@ -954,7 +953,7 @@ void CConfigMain::AudioSettingsChanged(wxCommandEvent& event)
 	case ID_VOLUME:
 		SConfig::GetInstance().m_Volume = VolumeSlider->GetValue();
 		AudioCommon::UpdateSoundStream();
-		VolumeText->SetLabel(wxString::Format(wxT("%d %%"), VolumeSlider->GetValue()));
+		VolumeText->SetLabel(wxString::Format("%d %%", VolumeSlider->GetValue()));
 		break;
 
 	case ID_DSPTHREAD:
@@ -1056,9 +1055,9 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
 	std::string filename = WxStrToStr(wxFileSelector(
 		_("Choose a file to open"),
 		StrToWxStr(File::GetUserPath(D_GCUSER_IDX)),
-		isSlotA ? wxT(GC_MEMCARDA) : wxT(GC_MEMCARDB),
+		isSlotA ? GC_MEMCARDA : GC_MEMCARDB,
 		wxEmptyString,
-		_("Gamecube Memory Cards (*.raw,*.gcp)") + wxString(wxT("|*.raw;*.gcp"))));
+		_("Gamecube Memory Cards (*.raw,*.gcp)") + "|*.raw;*.gcp"));
 
 	if (!filename.empty())
 	{
@@ -1112,17 +1111,17 @@ void CConfigMain::ChooseMemcardPath(std::string& strMemcard, bool isSlotA)
 void CConfigMain::ChooseSIDevice(wxString deviceName, int deviceNum)
 {
 	SIDevices tempType;
-	if (!deviceName.compare(WXSTR_TRANS(SIDEV_STDCONT_STR)))
+	if (!deviceName.compare(_(SIDEV_STDCONT_STR)))
 		tempType = SIDEVICE_GC_CONTROLLER;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_STEERING_STR)))
+	else if (!deviceName.compare(_(SIDEV_STEERING_STR)))
 		tempType = SIDEVICE_GC_STEERING;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_DANCEMAT_STR)))
+	else if (!deviceName.compare(_(SIDEV_DANCEMAT_STR)))
 		tempType = SIDEVICE_DANCEMAT;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_BONGO_STR)))
+	else if (!deviceName.compare(_(SIDEV_BONGO_STR)))
 		tempType = SIDEVICE_GC_TARUKONGA;
-	else if (!deviceName.compare(wxT(SIDEV_GBA_STR)))
+	else if (!deviceName.compare(SIDEV_GBA_STR))
 		tempType = SIDEVICE_GC_GBA;
-	else if (!deviceName.compare(WXSTR_TRANS(SIDEV_AM_BB_STR)))
+	else if (!deviceName.compare(_(SIDEV_AM_BB_STR)))
 		tempType = SIDEVICE_AM_BASEBOARD;
 	else
 		tempType = SIDEVICE_NONE;
@@ -1140,17 +1139,17 @@ void CConfigMain::ChooseEXIDevice(wxString deviceName, int deviceNum)
 {
 	TEXIDevices tempType;
 
-	if (!deviceName.compare(WXSTR_TRANS(EXIDEV_MEMCARD_STR)))
+	if (!deviceName.compare(_(EXIDEV_MEMCARD_STR)))
 		tempType = EXIDEVICE_MEMORYCARD;
-	else if (!deviceName.compare(WXSTR_TRANS(EXIDEV_MIC_STR)))
+	else if (!deviceName.compare(_(EXIDEV_MIC_STR)))
 		tempType = EXIDEVICE_MIC;
-	else if (!deviceName.compare(wxT(EXIDEV_BBA_STR)))
+	else if (!deviceName.compare(EXIDEV_BBA_STR))
 		tempType = EXIDEVICE_ETH;
-	else if (!deviceName.compare(WXSTR_TRANS(EXIDEV_AM_BB_STR)))
+	else if (!deviceName.compare(_(EXIDEV_AM_BB_STR)))
 		tempType = EXIDEVICE_AM_BASEBOARD;
-	else if (!deviceName.compare(wxT(EXIDEV_GECKO_STR)))
+	else if (!deviceName.compare(EXIDEV_GECKO_STR))
 		tempType = EXIDEVICE_GECKO;
-	else if (!deviceName.compare(WXSTR_TRANS(DEV_NONE_STR)))
+	else if (!deviceName.compare(_(DEV_NONE_STR)))
 		tempType = EXIDEVICE_NONE;
 	else
 		tempType = EXIDEVICE_DUMMY;
@@ -1199,7 +1198,7 @@ void CConfigMain::WiiSettingsChanged(wxCommandEvent& event)
 		u8 country_code = GetSADRCountryCode(wii_system_lang);
 		if (!SConfig::GetInstance().m_SYSCONF->SetArrayData("IPL.SADR", &country_code, 1))
 		{
-			PanicAlert("Failed to update country code in SYSCONF");
+			PanicAlertT("Failed to update country code in SYSCONF");
 		}
 		break;
 	}

Source/Core/DolphinWX/Debugger/BreakpointDlg.cpp

@@ -25,10 +25,10 @@ BEGIN_EVENT_TABLE(BreakPointDlg, wxDialog)
 END_EVENT_TABLE()
 
 BreakPointDlg::BreakPointDlg(CBreakPointWindow *_Parent)
-	: wxDialog(_Parent, wxID_ANY, wxT("BreakPoint"))
+	: wxDialog(_Parent, wxID_ANY, _("Add Breakpoint"))
 	, Parent(_Parent)
 {
-	m_pEditAddress = new wxTextCtrl(this, wxID_ANY, wxT("80000000"));
+	m_pEditAddress = new wxTextCtrl(this, wxID_ANY, "80000000");
 
 	wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
 	sMainSizer->Add(m_pEditAddress, 0, wxEXPAND | wxALL, 5);
@@ -50,7 +50,7 @@ void BreakPointDlg::OnOK(wxCommandEvent& event)
 	}
 	else
 	{
-		PanicAlert("The address %s is invalid.", WxStrToStr(AddressString).c_str());
+		PanicAlertT("The address %s is invalid.", WxStrToStr(AddressString).c_str());
 	}
 
 	event.Skip();

Source/Core/DolphinWX/Debugger/BreakpointView.cpp

@@ -36,11 +36,11 @@ void CBreakPointView::Update()
 {
 	ClearAll();
 
-	InsertColumn(0, wxT("Active"));
-	InsertColumn(1, wxT("Type"));
-	InsertColumn(2, wxT("Function"));
-	InsertColumn(3, wxT("Address"));
-	InsertColumn(4, wxT("Flags"));
+	InsertColumn(0, _("Active"));
+	InsertColumn(1, _("Type"));
+	InsertColumn(2, _("Function"));
+	InsertColumn(3, _("Address"));
+	InsertColumn(4, _("Flags"));
 
 	char szBuffer[64];
 	const BreakPoints::TBreakPoints& rBreakPoints = PowerPC::breakpoints.GetBreakPoints();

Source/Core/DolphinWX/Debugger/BreakpointWindow.cpp

@@ -49,27 +49,27 @@ public:
 		m_Bitmaps[Toolbar_Add_BP] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_breakpoint_png).ConvertToImage().Rescale(24, 24));
 		m_Bitmaps[Toolbar_Add_MC] = wxBitmap(wxGetBitmapFromMemory(toolbar_add_memcheck_png).ConvertToImage().Rescale(24, 24));
 
-		AddTool(ID_DELETE, wxT("Delete"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnDelete, parent, ID_DELETE);
+		AddTool(ID_DELETE, _("Delete"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnDelete, parent, ID_DELETE);
 
-		AddTool(ID_CLEAR, wxT("Clear"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnClear, parent, ID_CLEAR);
+		AddTool(ID_CLEAR, _("Clear"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnClear, parent, ID_CLEAR);
 
-		AddTool(ID_ADDBP, wxT("+BP"), m_Bitmaps[Toolbar_Add_BP]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP);
+		AddTool(ID_ADDBP, "+BP", m_Bitmaps[Toolbar_Add_BP]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddBreakPoint, parent, ID_ADDBP);
 
 		// Add memory breakpoints if you can use them
 		if (Memory::AreMemoryBreakpointsActivated())
 		{
-			AddTool(ID_ADDMC, wxT("+MC"), m_Bitmaps[Toolbar_Add_MC]);
-			Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC);
+			AddTool(ID_ADDMC, "+MC", m_Bitmaps[Toolbar_Add_MC]);
+			Bind(wxEVT_TOOL, &CBreakPointWindow::OnAddMemoryCheck, parent, ID_ADDMC);
 		}
 
-		AddTool(ID_LOAD, wxT("Load"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::LoadAll, parent, ID_LOAD);
+		AddTool(ID_LOAD, _("Load"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::LoadAll, parent, ID_LOAD);
 
-		AddTool(ID_SAVE, wxT("Save"), m_Bitmaps[Toolbar_Delete]);
-		Bind(wxEVT_COMMAND_TOOL_CLICKED, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE);
+		AddTool(ID_SAVE, _("Save"), m_Bitmaps[Toolbar_Delete]);
+		Bind(wxEVT_TOOL, &CBreakPointWindow::Event_SaveAll, parent, ID_SAVE);
 	}
 
 private:

Source/Core/DolphinWX/Debugger/BreakpointWindow.h

@@ -25,7 +25,7 @@ public:
 	CBreakPointWindow(CCodeWindow* _pCodeWindow,
 		wxWindow* parent,
 		wxWindowID id = wxID_ANY,
-		const wxString& title = wxT("Breakpoints"),
+		const wxString& title = _("Breakpoints"),
 		const wxPoint& pos = wxDefaultPosition,
 		const wxSize& size = wxDefaultSize,
 		long style = wxTAB_TRAVERSAL | wxBORDER_NONE);

Source/Core/DolphinWX/Debugger/CodeView.cpp

@@ -227,7 +227,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 
 #if wxUSE_CLIPBOARD
 		case IDM_COPYADDRESS:
-			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
+			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format("%08x", selection)));
 			break;
 
 		case IDM_COPYCODE:
@@ -310,7 +310,7 @@ void CCodeView::OnPopupMenu(wxCommandEvent& event)
 				Symbol *symbol = symbol_db->GetSymbolFromAddr(selection);
 				if (symbol)
 				{
-					wxTextEntryDialog input_symbol(this, StrToWxStr("Rename symbol:"),
+					wxTextEntryDialog input_symbol(this, _("Rename symbol:"),
 							wxGetTextFromUserPromptStr,
 							StrToWxStr(symbol->name));
 					if (input_symbol.ShowModal() == wxID_OK)
@@ -339,24 +339,23 @@ void CCodeView::OnMouseUpR(wxMouseEvent& event)
 	// popup menu
 	wxMenu* menu = new wxMenu;
 	//menu->Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
-	menu->Append(IDM_FOLLOWBRANCH,
-			StrToWxStr("&Follow branch"))->Enable(AddrToBranch(selection) ? true : false);
+	menu->Append(IDM_FOLLOWBRANCH, _("&Follow branch"))->Enable(AddrToBranch(selection) ? true : false);
 	menu->AppendSeparator();
 #if wxUSE_CLIPBOARD
-	menu->Append(IDM_COPYADDRESS, StrToWxStr("Copy &address"));
-	menu->Append(IDM_COPYFUNCTION, StrToWxStr("Copy &function"))->Enable(isSymbol);
-	menu->Append(IDM_COPYCODE, StrToWxStr("Copy &code line"));
-	menu->Append(IDM_COPYHEX, StrToWxStr("Copy &hex"));
+	menu->Append(IDM_COPYADDRESS, _("Copy &address"));
+	menu->Append(IDM_COPYFUNCTION, _("Copy &function"))->Enable(isSymbol);
+	menu->Append(IDM_COPYCODE, _("Copy &code line"));
+	menu->Append(IDM_COPYHEX, _("Copy &hex"));
 	menu->AppendSeparator();
 #endif
-	menu->Append(IDM_RENAMESYMBOL, StrToWxStr("Rename &symbol"))->Enable(isSymbol);
+	menu->Append(IDM_RENAMESYMBOL, _("Rename &symbol"))->Enable(isSymbol);
 	menu->AppendSeparator();
 	menu->Append(IDM_RUNTOHERE, _("&Run To Here"));
 	menu->Append(IDM_ADDFUNCTION, _("&Add function"));
-	menu->Append(IDM_JITRESULTS, StrToWxStr("PPC vs X86"));
-	menu->Append(IDM_INSERTBLR, StrToWxStr("Insert &blr"));
-	menu->Append(IDM_INSERTNOP, StrToWxStr("Insert &nop"));
-	menu->Append(IDM_PATCHALERT, StrToWxStr("Patch alert"));
+	menu->Append(IDM_JITRESULTS, _("PPC vs X86"));
+	menu->Append(IDM_INSERTBLR, _("Insert &blr"));
+	menu->Append(IDM_INSERTNOP, _("Insert &nop"));
+	menu->Append(IDM_PATCHALERT, _("Patch alert"));
 	PopupMenu(menu);
 	event.Skip(true);
 }
@@ -375,12 +374,12 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 	dc.SetFont(DebuggerFont);
 
 	wxCoord w,h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h);
+	dc.GetTextExtent("0WJyq", &w, &h);
 
 	if (h > rowHeight)
 		rowHeight = h;
 
-	dc.GetTextExtent(_T("W"),&w,&h);
+	dc.GetTextExtent("W", &w, &h);
 	int charWidth = w;
 
 	struct branch
@@ -399,15 +398,15 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 	// Colors and brushes
 	// -------------------------
 	dc.SetBackgroundMode(wxTRANSPARENT); // the text background
-	const wxChar* bgColor = _T("#ffffff");
+	const wxColour bgColor = *wxWHITE;
 	wxPen nullPen(bgColor);
-	wxPen currentPen(_T("#000000"));
-	wxPen selPen(_T("#808080")); // gray
+	wxPen currentPen(*wxBLACK_PEN);
+	wxPen selPen(*wxGREY_PEN);
 	nullPen.SetStyle(wxTRANSPARENT);
 	currentPen.SetStyle(wxSOLID);
-	wxBrush currentBrush(_T("#FFEfE8")); // light gray
-	wxBrush pcBrush(_T("#70FF70")); // green
-	wxBrush bpBrush(_T("#FF3311")); // red
+	wxBrush currentBrush(*wxLIGHT_GREY_BRUSH);
+	wxBrush pcBrush(*wxGREEN_BRUSH);
+	wxBrush bpBrush(*wxRED_BRUSH);
 
 	wxBrush bgBrush(bgColor);
 	wxBrush nullBrush(bgColor);
@@ -429,9 +428,9 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 		int rowY1 = rc.height / 2 + rowHeight * i - rowHeight / 2;
 		int rowY2 = rc.height / 2 + rowHeight * i + rowHeight / 2;
 
-		wxString temp = wxString::Format(_T("%08x"), address);
+		wxString temp = wxString::Format("%08x", address);
 		u32 col = debugger->GetColor(address);
-		wxBrush rowBrush(wxColor(col >> 16, col >> 8, col));
+		wxBrush rowBrush(wxColour(col >> 16, col >> 8, col));
 		dc.SetBrush(nullBrush);
 		dc.SetPen(nullPen);
 		dc.DrawRectangle(0, rowY1, 16, rowY2 - rowY1 + 2);
@@ -450,9 +449,9 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 		dc.SetBrush(currentBrush);
 		if (!plain)
 		{
-			dc.SetTextForeground(_T("#600000")); // the address text is dark red
+			dc.SetTextForeground("#600000"); // the address text is dark red
 			dc.DrawText(temp, 17, rowY1);
-			dc.SetTextForeground(_T("#000000"));
+			dc.SetTextForeground(*wxBLACK);
 		}
 
 		// If running
@@ -495,11 +494,11 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 					branches[numBranches].srcAddr = address / align;
 					branches[numBranches++].dst = (int)(rowY1 + ((s64)(u32)offs - (s64)(u32)address) * rowHeight / align + rowHeight / 2);
 					sprintf(desc, "-->%s", debugger->GetDescription(offs).c_str());
-					dc.SetTextForeground(_T("#600060")); // the -> arrow illustrations are purple
+					dc.SetTextForeground(wxTheColourDatabase->Find("PURPLE")); // the -> arrow illustrations are purple
 				}
 				else
 				{
-					dc.SetTextForeground(_T("#000000"));
+					dc.SetTextForeground(*wxBLACK);
 				}
 
 				dc.DrawText(StrToWxStr(dis2), 17 + 17*charWidth, rowY1);
@@ -508,9 +507,9 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 
 			// Show blr as its' own color
 			if (strcmp(dis, "blr"))
-				dc.SetTextForeground(_T("#007000")); // dark green
+				dc.SetTextForeground(wxTheColourDatabase->Find("DARK GREEN"));
 			else
-				dc.SetTextForeground(_T("#8000FF")); // purple
+				dc.SetTextForeground(wxTheColourDatabase->Find("VIOLET"));
 
 			dc.DrawText(StrToWxStr(dis), 17 + (plain ? 1*charWidth : 9*charWidth), rowY1);
 
@@ -521,7 +520,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
 
 			if (!plain)
 			{
-				dc.SetTextForeground(_T("#0000FF")); // blue
+				dc.SetTextForeground(*wxBLUE);
 
 				//char temp[256];
 				//UnDecorateSymbolName(desc,temp,255,UNDNAME_COMPLETE);

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
 	// ------------------

Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp

@@ -152,7 +152,7 @@ void CCodeWindow::CreateMenuSymbols(wxMenuBar *pMenuBar)
 	pSymbolsMenu->Append(IDM_SAVEMAPFILE, _("&Save symbol map"));
 	pSymbolsMenu->AppendSeparator();
 	pSymbolsMenu->Append(IDM_SAVEMAPFILEWITHCODES, _("Save code"),
-		StrToWxStr("Save the entire disassembled code. This may take a several seconds"
+		_("Save the entire disassembled code. This may take a several seconds"
 		" and may require between 50 and 100 MB of hard drive space. It will only save code"
 		" that are in the first 4 MB of memory, if you are debugging a game that load .rel"
 		" files with code to memory you may want to increase that to perhaps 8 MB, you can do"
@@ -198,10 +198,10 @@ void CCodeWindow::OnProfilerMenu(wxCommandEvent& event)
 				Profiler::WriteProfileResults(filename);
 
 				wxFileType* filetype = nullptr;
-				if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("txt"))))
+				if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromExtension("txt")))
 				{
 					// From extension failed, trying with MIME type now
-					if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"))))
+					if (!(filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType("text/plain")))
 						// MIME type failed, aborting mission
 						break;
 				}
@@ -227,7 +227,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 	switch (event.GetId())
 	{
 	case IDM_CLEARSYMBOLS:
-		if (!AskYesNo("Do you want to clear the list of symbol names?")) return;
+		if (!AskYesNoT("Do you want to clear the list of symbol names?")) return;
 		g_symbolDB.Clear();
 		Host_NotifyMapLoaded();
 		break;
@@ -279,7 +279,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 			const wxString path = wxFileSelector(
 				_("Apply signature file"), wxEmptyString,
 				wxEmptyString, wxEmptyString,
-				_T("Dolphin Symbol Rename File (*.sym)|*.sym"),
+				"Dolphin Symbol Rename File (*.sym)|*.sym",
 				wxFD_OPEN | wxFD_FILE_MUST_EXIST, this);
 
 			if (!path.IsEmpty())
@@ -313,7 +313,7 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 		{
 			wxTextEntryDialog input_prefix(
 				this,
-				StrToWxStr("Only export symbols with prefix:\n(Blank for all symbols)"),
+				_("Only export symbols with prefix:\n(Blank for all symbols)"),
 				wxGetTextFromUserPromptStr,
 				wxEmptyString);
 
@@ -322,8 +322,8 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 				std::string prefix(WxStrToStr(input_prefix.GetValue()));
 
 				wxString path = wxFileSelector(
-					_T("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,
-					_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_SAVE,
+					_("Save signature as"), wxEmptyString, wxEmptyString, wxEmptyString,
+					"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_SAVE,
 					this);
 				if (!path.IsEmpty())
 				{
@@ -337,8 +337,8 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 	case IDM_USESIGNATUREFILE:
 		{
 			wxString path = wxFileSelector(
-				_T("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,
-				_T("Dolphin Signature File (*.dsy)|*.dsy;"), wxFD_OPEN | wxFD_FILE_MUST_EXIST,
+				_("Apply signature file"), wxEmptyString, wxEmptyString, wxEmptyString,
+				"Dolphin Signature File (*.dsy)|*.dsy;", wxFD_OPEN | wxFD_FILE_MUST_EXIST,
 				this);
 			if (!path.IsEmpty())
 			{

Source/Core/DolphinWX/Debugger/DSPDebugWindow.cpp

@@ -57,11 +57,11 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
 
 	m_Toolbar = new wxAuiToolBar(this, ID_TOOLBAR,
 		wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_TEXT);
-	m_Toolbar->AddTool(ID_RUNTOOL, wxT("Pause"),
+	m_Toolbar->AddTool(ID_RUNTOOL, _("Pause"),
 		wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
-	m_Toolbar->AddTool(ID_STEPTOOL, wxT("Step"),
+	m_Toolbar->AddTool(ID_STEPTOOL, _("Step"),
 		wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_OTHER, wxSize(10,10)));
-	m_Toolbar->AddTool(ID_SHOWPCTOOL, wxT("Show PC"),
+	m_Toolbar->AddTool(ID_SHOWPCTOOL, _("Show PC"),
 		wxArtProvider::GetBitmap(wxART_GO_TO_PARENT, wxART_OTHER, wxSize(10,10)));
 	m_Toolbar->AddSeparator();
 	m_Toolbar->AddControl(new wxTextCtrl(m_Toolbar, ID_ADDRBOX, wxEmptyString,
@@ -81,7 +81,7 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
 	m_CodeView->SetPlain();
 	code_sizer->Add(m_CodeView, 1, wxALL | wxEXPAND);
 	code_panel->SetSizer(code_sizer);
-	m_MainNotebook->AddPage(code_panel, wxT("Disasm"), true);
+	m_MainNotebook->AddPage(code_panel, _("Disassembly"), true);
 
 	wxPanel *mem_panel = new wxPanel(m_MainNotebook, wxID_ANY);
 	wxBoxSizer *mem_sizer = new wxBoxSizer(wxVERTICAL);
@@ -89,7 +89,7 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
 	m_MemView = new CMemoryView(&debug_interface, mem_panel);
 	mem_sizer->Add(m_MemView, 1, wxALL | wxEXPAND);
 	mem_panel->SetSizer(mem_sizer);
-	m_MainNotebook->AddPage(mem_panel, wxT("Mem"));
+	m_MainNotebook->AddPage(mem_panel, _("Memory"));
 
 	m_Regs = new DSPRegisterView(this, ID_DSP_REGS);
 
@@ -100,14 +100,14 @@ DSPDebuggerLLE::DSPDebuggerLLE(wxWindow* parent, wxWindowID id)
 
 	m_mgr.AddPane(m_SymbolList, wxAuiPaneInfo().
 		Left().CloseButton(false).
-		Caption(wxT("Symbols")).Dockable(true));
+		Caption(_("Symbols")).Dockable(true));
 
 	m_mgr.AddPane(m_MainNotebook, wxAuiPaneInfo().
-		Name(wxT("m_MainNotebook")).Center().
+		Name("m_MainNotebook").Center().
 		CloseButton(false).MaximizeButton(true));
 
 	m_mgr.AddPane(m_Regs, wxAuiPaneInfo().Right().
-		CloseButton(false).Caption(wxT("Registers")).
+		CloseButton(false).Caption(_("Registers")).
 		Dockable(true));
 
 	UpdateState();
@@ -189,14 +189,14 @@ void DSPDebuggerLLE::UpdateState()
 {
 	if (DSPCore_GetState() == DSPCORE_RUNNING)
 	{
-		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Pause"));
+		m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Pause"));
 		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
 			wxArtProvider::GetBitmap(wxART_TICK_MARK, wxART_OTHER, wxSize(10,10)));
 		m_Toolbar->EnableTool(ID_STEPTOOL, false);
 	}
 	else
 	{
-		m_Toolbar->SetToolLabel(ID_RUNTOOL, wxT("Run"));
+		m_Toolbar->SetToolLabel(ID_RUNTOOL, _("Run"));
 		m_Toolbar->SetToolBitmap(ID_RUNTOOL,
 			wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_OTHER, wxSize(10,10)));
 		m_Toolbar->EnableTool(ID_STEPTOOL, true);

Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp

@@ -25,7 +25,7 @@ wxString CDSPRegTable::GetValue(int row, int col)
 		switch (col)
 		{
 		case 0: return StrToWxStr(pdregname(row));
-		case 1: return wxString::Format(wxT("0x%04x"), DSPCore_ReadRegister(row));
+		case 1: return wxString::Format("0x%04x", DSPCore_ReadRegister(row));
 		default: return wxEmptyString;
 		}
 	}
@@ -56,7 +56,7 @@ wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKi
 {
 	wxGridCellAttr *attr = new wxGridCellAttr();
 
-	attr->SetBackgroundColour(wxColour(wxT("#FFFFFF")));
+	attr->SetBackgroundColour(*wxWHITE);
 
 	switch (col)
 	{
@@ -69,7 +69,7 @@ wxGridCellAttr *CDSPRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKi
 	}
 
 	if (col == 1)
-		attr->SetTextColour(m_CachedRegHasChanged[row] ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000")));
+		attr->SetTextColour(m_CachedRegHasChanged[row] ? *wxRED : *wxBLACK);
 
 	attr->IncRef();
 	return attr;

Source/Core/DolphinWX/Debugger/DebuggerPanel.cpp

@@ -153,7 +153,7 @@ void GFXDebuggerPanel::CreateGUIControls()
 	m_pButtonPauseAtNextFrame = new wxButton(this, ID_PAUSE_AT_NEXT_FRAME, _("Go to Next Frame"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Next Frame"));
 	m_pButtonCont = new wxButton(this, ID_CONT, _("Continue"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("Continue"));
 
-	m_pCount = new wxTextCtrl(this, ID_COUNT, wxT("1"), wxDefaultPosition, wxSize(50,25), wxTE_RIGHT, wxDefaultValidator, _("Count"));
+	m_pCount = new wxTextCtrl(this, ID_COUNT, "1", wxDefaultPosition, wxSize(50,25), wxTE_RIGHT, wxDefaultValidator, _("Count"));
 
 	m_pPauseAtList = new wxChoice(this, ID_PAUSE_AT_LIST, wxDefaultPosition, wxSize(100,25), 0, nullptr,0,wxDefaultValidator, _("PauseAtList"));
 	for (int i=0; i<numPauseEventMap; i++)

Source/Core/DolphinWX/Debugger/DebuggerUIUtil.cpp

@@ -9,5 +9,5 @@
 #include "DolphinWX/Debugger/DebuggerUIUtil.h"
 
 // The default font
-wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, wxT("monospace"));
+wxFont DebuggerFont = wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false, "monospace");
 

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);
 

Source/Core/DolphinWX/Debugger/MemoryCheckDlg.cpp

@@ -23,7 +23,7 @@
 #include "DolphinWX/Debugger/BreakpointWindow.h"
 #include "DolphinWX/Debugger/MemoryCheckDlg.h"
 
-#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, wxT(text))
+#define TEXT_BOX(text) new wxStaticText(this, wxID_ANY, _(text))
 
 BEGIN_EVENT_TABLE(MemoryCheckDlg, wxDialog)
 	EVT_BUTTON(wxID_OK, MemoryCheckDlg::OnOK)
@@ -33,8 +33,8 @@ MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow *parent)
 	: wxDialog(parent, wxID_ANY, _("Memory Check"))
 	, m_parent(parent)
 {
-	m_pEditStartAddress = new wxTextCtrl(this, wxID_ANY, wxT(""));
-	m_pEditEndAddress = new wxTextCtrl(this, wxID_ANY, wxT(""));
+	m_pEditStartAddress = new wxTextCtrl(this, wxID_ANY, "");
+	m_pEditEndAddress = new wxTextCtrl(this, wxID_ANY, "");
 	m_pWriteFlag = new wxCheckBox(this, wxID_ANY, _("Write"));
 	m_pWriteFlag->SetValue(true);
 	m_pReadFlag = new wxCheckBox(this, wxID_ANY, _("Read"));
@@ -43,17 +43,17 @@ MemoryCheckDlg::MemoryCheckDlg(CBreakPointWindow *parent)
 	m_log_flag->SetValue(true);
 	m_break_flag = new wxCheckBox(this, wxID_ANY, _("Break"));
 
-	wxStaticBoxSizer *sAddressRangeBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("Address Range"));
+	wxStaticBoxSizer *sAddressRangeBox = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Address Range"));
 	sAddressRangeBox->Add(TEXT_BOX("Start"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
 	sAddressRangeBox->Add(m_pEditStartAddress, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, 10);
 	sAddressRangeBox->Add(TEXT_BOX("End"), 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 5);
 	sAddressRangeBox->Add(m_pEditEndAddress, 1, wxALIGN_CENTER_VERTICAL);
 
-	wxStaticBoxSizer *sActionBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Action"));
+	wxStaticBoxSizer *sActionBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Action"));
 	sActionBox->Add(m_pWriteFlag);
 	sActionBox->Add(m_pReadFlag);
 
-	wxBoxSizer* sFlags = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Flags"));
+	wxBoxSizer* sFlags = new wxStaticBoxSizer(wxVERTICAL, this, _("Flags"));
 	sFlags->Add(m_log_flag);
 	sFlags->Add(m_break_flag);
 

Source/Core/DolphinWX/Debugger/MemoryView.cpp

@@ -147,7 +147,7 @@ void CMemoryView::OnPopupMenu(wxCommandEvent& event)
 	{
 #if wxUSE_CLIPBOARD
 		case IDM_COPYADDRESS:
-			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format(_T("%08x"), selection)));
+			wxTheClipboard->SetData(new wxTextDataObject(wxString::Format("%08x", selection)));
 			break;
 
 		case IDM_COPYHEX:
@@ -189,18 +189,18 @@ void CMemoryView::OnMouseDownR(wxMouseEvent& event)
 {
 	// popup menu
 	wxMenu* menu = new wxMenu;
-	//menu.Append(IDM_GOTOINMEMVIEW, "&Goto in mem view");
+	//menu.Append(IDM_GOTOINMEMVIEW, _("&Goto in mem view"));
 #if wxUSE_CLIPBOARD
-	menu->Append(IDM_COPYADDRESS, StrToWxStr("Copy &address"));
-	menu->Append(IDM_COPYHEX, StrToWxStr("Copy &hex"));
+	menu->Append(IDM_COPYADDRESS, _("Copy &address"));
+	menu->Append(IDM_COPYHEX, _("Copy &hex"));
 #endif
-	menu->Append(IDM_TOGGLEMEMORY, StrToWxStr("Toggle &memory"));
+	menu->Append(IDM_TOGGLEMEMORY, _("Toggle &memory"));
 
 	wxMenu* viewAsSubMenu = new wxMenu;
-	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:"));
+	viewAsSubMenu->Append(IDM_VIEWASFP, _("FP value"));
+	viewAsSubMenu->Append(IDM_VIEWASASCII, "ASCII");
+	viewAsSubMenu->Append(IDM_VIEWASHEX, _("Hex"));
+	menu->AppendSubMenu(viewAsSubMenu, _("View As:"));
 
 	PopupMenu(menu);
 }
@@ -209,14 +209,14 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 {
 	wxPaintDC dc(this);
 	wxRect rc = GetClientRect();
-	wxFont hFont(_T("Courier"));
+	wxFont hFont("Courier");
 	hFont.SetFamily(wxFONTFAMILY_TELETYPE);
 
 	wxCoord w,h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h,nullptr,nullptr,&hFont);
+	dc.GetTextExtent("0WJyq", &w, &h, nullptr, nullptr, &hFont);
 	if (h > rowHeight)
 		rowHeight = h;
-	dc.GetTextExtent(_T("0WJyq"),&w,&h,nullptr,nullptr,&DebuggerFont);
+	dc.GetTextExtent("0WJyq", &w, &h, nullptr, nullptr, &DebuggerFont);
 	if (h > rowHeight)
 		rowHeight = h;
 
@@ -225,7 +225,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 	else
 		dc.SetFont(DebuggerFont);
 
-	dc.GetTextExtent(_T("W"),&w,&h);
+	dc.GetTextExtent("W", &w, &h);
 	int fontSize = w;
 	int textPlacement = 17 + 9 * fontSize;
 
@@ -233,15 +233,15 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 	int width   = rc.width;
 	int numRows = (rc.height / rowHeight) / 2 + 2;
 	dc.SetBackgroundMode(wxTRANSPARENT);
-	const wxChar* bgColor = _T("#ffffff");
+	const wxColour bgColor = *wxWHITE;
 	wxPen nullPen(bgColor);
-	wxPen currentPen(_T("#000000"));
-	wxPen selPen(_T("#808080")); // gray
+	wxPen currentPen(*wxBLACK_PEN);
+	wxPen selPen(*wxGREY_PEN);
 	nullPen.SetStyle(wxTRANSPARENT);
 
-	wxBrush currentBrush(_T("#FFEfE8")); // light gray
-	wxBrush pcBrush(_T("#70FF70")); // green
-	wxBrush mcBrush(_T("#1133FF")); // blue
+	wxBrush currentBrush(*wxLIGHT_GREY_BRUSH);
+	wxBrush pcBrush(*wxGREEN_BRUSH);
+	wxBrush mcBrush(*wxBLUE_BRUSH);
 	wxBrush bgBrush(bgColor);
 	wxBrush nullBrush(bgColor);
 	nullBrush.SetStyle(wxTRANSPARENT);
@@ -259,9 +259,9 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 		int rowY1 = rc.height / 2 + rowHeight * row - rowHeight / 2;
 		int rowY2 = rc.height / 2 + rowHeight * row + rowHeight / 2;
 
-		wxString temp = wxString::Format(_T("%08x"), address);
+		wxString temp = wxString::Format("%08x", address);
 		u32 col = debugger->GetColor(address);
-		wxBrush rowBrush(wxColor(col >> 16, col >> 8, col));
+		wxBrush rowBrush(wxColour(col >> 16, col >> 8, col));
 		dc.SetBrush(nullBrush);
 		dc.SetPen(nullPen);
 		dc.DrawRectangle(0, rowY1, 16, rowY2);
@@ -278,16 +278,16 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 
 		dc.DrawRectangle(16, rowY1, width, rowY2 - 1);
 		dc.SetBrush(currentBrush);
-		dc.SetTextForeground(_T("#600000"));
+		dc.SetTextForeground("#600000"); // Dark red
 		dc.DrawText(temp, 17, rowY1);
 
 		if (viewAsType != VIEWAS_HEX)
 		{
 			char mem[256];
 			debugger->GetRawMemoryString(memory, address, mem, 256);
-			dc.SetTextForeground(_T("#000080"));
+			dc.SetTextForeground(wxTheColourDatabase->Find("NAVY"));
 			dc.DrawText(StrToWxStr(mem), 17+fontSize*(8), rowY1);
-			dc.SetTextForeground(_T("#000000"));
+			dc.SetTextForeground(*wxBLACK);
 		}
 
 		if (debugger->IsAlive())
@@ -371,7 +371,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 			if (desc[0] == 0)
 				strcpy(desc, debugger->GetDescription(address).c_str());
 
-			dc.SetTextForeground(_T("#0000FF"));
+			dc.SetTextForeground(*wxBLUE);
 
 			if (strlen(desc))
 				dc.DrawText(StrToWxStr(desc), 17+fontSize*((8+8+8+30)*2), rowY1);

Source/Core/DolphinWX/Debugger/MemoryWindow.cpp

@@ -94,8 +94,8 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
 	//sizerBig->Add(sizerLeft, 1, wxEXPAND);
 	sizerBig->Add(memview, 20, wxEXPAND);
 	sizerBig->Add(sizerRight, 0, wxEXPAND | wxALL, 3);
-	sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, _T("")));
-	sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, _T("")));
+	sizerRight->Add(addrbox = new wxTextCtrl(this, IDM_MEM_ADDRBOX, ""));
+	sizerRight->Add(valbox = new wxTextCtrl(this, IDM_VALBOX, ""));
 	sizerRight->Add(new wxButton(this, IDM_SETVALBUTTON, _("Set &Value")));
 
 	sizerRight->AddSpacer(5);
@@ -108,15 +108,15 @@ CMemoryWindow::CMemoryWindow(wxWindow* parent, wxWindowID id,
 	wxStaticBoxSizer* sizerSearchType = new wxStaticBoxSizer(wxVERTICAL, this, _("Search"));
 
 	sizerSearchType->Add(btnSearch = new wxButton(this, IDM_SEARCH, _("Search")));
-	sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, _T("&Ascii ")));
+	sizerSearchType->Add(chkAscii = new wxCheckBox(this, IDM_ASCII, "&Ascii "));
 	sizerSearchType->Add(chkHex = new wxCheckBox(this, IDM_HEX, _("&Hex")));
 	sizerRight->Add(sizerSearchType);
 	wxStaticBoxSizer* sizerDataTypes = new wxStaticBoxSizer(wxVERTICAL, this, _("Data Type"));
 
 	sizerDataTypes->SetMinSize(74, 40);
-	sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, _T("&U8")));
-	sizerDataTypes->Add(chk16 = new wxCheckBox(this, IDM_U16, _T("&U16")));
-	sizerDataTypes->Add(chk32 = new wxCheckBox(this, IDM_U32, _T("&U32")));
+	sizerDataTypes->Add(chk8 = new wxCheckBox(this, IDM_U8, "&U8"));
+	sizerDataTypes->Add(chk16 = new wxCheckBox(this, IDM_U16, "&U16"));
+	sizerDataTypes->Add(chk32 = new wxCheckBox(this, IDM_U32, "&U32"));
 	sizerRight->Add(sizerDataTypes);
 	SetSizer(sizerBig);
 	chkHex->SetValue(1); //Set defaults
@@ -163,13 +163,13 @@ void CMemoryWindow::SetMemoryValue(wxCommandEvent& event)
 
 	if (!TryParse(std::string("0x") + str_addr, &addr))
 	{
-		PanicAlert("Invalid Address: %s", str_addr.c_str());
+		PanicAlertT("Invalid Address: %s", str_addr.c_str());
 		return;
 	}
 
 	if (!TryParse(std::string("0x") + str_val, &val))
 	{
-		PanicAlert("Invalid Value: %s", str_val.c_str());
+		PanicAlertT("Invalid Value: %s", str_val.c_str());
 		return;
 	}
 
@@ -416,7 +416,7 @@ void CMemoryWindow::onSearch(wxCommandEvent& event)
 				//Match was found
 				wxMessageBox(_("A match was found. Placing viewer at the offset."));
 				wxChar tmpwxstr[128] = {0};
-				wxSprintf(tmpwxstr, _T("%08x"), i);
+				wxSprintf(tmpwxstr, "%08x", i);
 				wxString tmpwx(tmpwxstr);
 				addrbox->SetValue(tmpwx);
 				//memview->curAddress = i;

Source/Core/DolphinWX/Debugger/RegisterView.cpp

@@ -55,10 +55,10 @@ wxString CRegTable::GetValue(int row, int col)
 		switch (col)
 		{
 		case 0: return StrToWxStr(GetGPRName(row));
-		case 1: return wxString::Format(wxT("%08x"), GPR(row));
+		case 1: return wxString::Format("%08x", GPR(row));
 		case 2: return StrToWxStr(GetFPRName(row));
-		case 3: return wxString::Format(wxT("%016llx"), riPS0(row));
-		case 4: return wxString::Format(wxT("%016llx"), riPS1(row));
+		case 3: return wxString::Format("%016llx", riPS0(row));
+		case 4: return wxString::Format("%016llx", riPS1(row));
 		default: return wxEmptyString;
 		}
 	}
@@ -69,7 +69,7 @@ wxString CRegTable::GetValue(int row, int col)
 			switch (col)
 			{
 			case 0: return StrToWxStr(special_reg_names[row - 32]);
-			case 1: return wxString::Format(wxT("%08x"), GetSpecialRegValue(row - 32));
+			case 1: return wxString::Format("%08x", GetSpecialRegValue(row - 32));
 			default: return wxEmptyString;
 			}
 		}
@@ -144,7 +144,7 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 {
 	wxGridCellAttr *attr = new wxGridCellAttr();
 
-	attr->SetBackgroundColour(wxColour(wxT("#FFFFFF")));  //wxWHITE
+	attr->SetBackgroundColour(*wxWHITE);
 	attr->SetFont(DebuggerFont);
 
 	switch (col)
@@ -169,7 +169,7 @@ wxGridCellAttr *CRegTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKind)
 	case 4: red = row < 32 ? m_CachedFRegHasChanged[row][col-3] : false; break;
 	}
 
-	attr->SetTextColour(red ? wxColor(wxT("#FF0000")) : wxColor(wxT("#000000")));
+	attr->SetTextColour(red ? *wxRED : *wxBLACK);
 	attr->IncRef();
 	return attr;
 }

Source/Core/DolphinWX/FifoPlayerDlg.cpp

@@ -76,19 +76,19 @@ FifoPlayerDlg::~FifoPlayerDlg()
 
 	// Disconnect Events
 	Unbind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this);
-	m_FrameFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this);
-	m_FrameToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this);
-	m_ObjectFromCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this);
-	m_ObjectToCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this);
-	m_EarlyMemoryUpdates->Unbind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
-	m_RecordStop->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this);
-	m_Save->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);
-	m_FramesToRecordCtrl->Unbind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this);
-	m_Close->Unbind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this);
+	m_FrameFromCtrl->Unbind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameFrom, this);
+	m_FrameToCtrl->Unbind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameTo, this);
+	m_ObjectFromCtrl->Unbind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectFrom, this);
+	m_ObjectToCtrl->Unbind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectTo, this);
+	m_EarlyMemoryUpdates->Unbind(wxEVT_CHECKBOX, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
+	m_RecordStop->Unbind(wxEVT_BUTTON, &FifoPlayerDlg::OnRecordStop, this);
+	m_Save->Unbind(wxEVT_BUTTON, &FifoPlayerDlg::OnSaveFile, this);
+	m_FramesToRecordCtrl->Unbind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnNumFramesToRecord, this);
+	m_Close->Unbind(wxEVT_BUTTON, &FifoPlayerDlg::OnCloseClick, this);
 
-	m_framesList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
-	m_objectsList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
-	m_objectCmdList->Unbind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
+	m_framesList->Unbind(wxEVT_LISTBOX, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
+	m_objectsList->Unbind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
+	m_objectCmdList->Unbind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
 
 	FifoPlayer::GetInstance().SetFrameWrittenCallback(nullptr);
 
@@ -321,33 +321,33 @@ void FifoPlayerDlg::CreateGUIControls()
 
 	// Connect Events
 	Bind(wxEVT_PAINT, &FifoPlayerDlg::OnPaint, this);
-	m_FrameFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameFrom, this);
-	m_FrameToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnFrameTo, this);
-	m_ObjectFromCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectFrom, this);
-	m_ObjectToCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnObjectTo, this);
-	m_EarlyMemoryUpdates->Bind(wxEVT_COMMAND_CHECKBOX_CLICKED, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
-	m_RecordStop->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnRecordStop, this);
-	m_Save->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnSaveFile, this);
-	m_FramesToRecordCtrl->Bind(wxEVT_COMMAND_SPINCTRL_UPDATED, &FifoPlayerDlg::OnNumFramesToRecord, this);
-	Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnCloseClick, this);
+	m_FrameFromCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameFrom, this);
+	m_FrameToCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnFrameTo, this);
+	m_ObjectFromCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectFrom, this);
+	m_ObjectToCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnObjectTo, this);
+	m_EarlyMemoryUpdates->Bind(wxEVT_CHECKBOX, &FifoPlayerDlg::OnCheckEarlyMemoryUpdates, this);
+	m_RecordStop->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnRecordStop, this);
+	m_Save->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnSaveFile, this);
+	m_FramesToRecordCtrl->Bind(wxEVT_SPINCTRL, &FifoPlayerDlg::OnNumFramesToRecord, this);
+	Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnCloseClick, this);
 
-	m_framesList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
-	m_objectsList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
-	m_objectCmdList->Bind(wxEVT_COMMAND_LISTBOX_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
+	m_framesList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnFrameListSelectionChanged, this);
+	m_objectsList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectListSelectionChanged, this);
+	m_objectCmdList->Bind(wxEVT_LISTBOX, &FifoPlayerDlg::OnObjectCmdListSelectionChanged, this);
 
-	m_beginSearch->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnBeginSearch, this);
-	m_findNext->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindNextClick, this);
-	m_findPrevious->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &FifoPlayerDlg::OnFindPreviousClick, this);
+	m_beginSearch->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnBeginSearch, this);
+	m_findNext->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnFindNextClick, this);
+	m_findPrevious->Bind(wxEVT_BUTTON, &FifoPlayerDlg::OnFindPreviousClick, this);
 
-	m_searchField->Bind(wxEVT_COMMAND_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this);
-	m_searchField->Bind(wxEVT_COMMAND_TEXT_UPDATED, &FifoPlayerDlg::OnSearchFieldTextChanged, this);
+	m_searchField->Bind(wxEVT_TEXT_ENTER, &FifoPlayerDlg::OnBeginSearch, this);
+	m_searchField->Bind(wxEVT_TEXT, &FifoPlayerDlg::OnSearchFieldTextChanged, this);
 
 	// Setup command copying
 	wxAcceleratorEntry entry;
 	entry.Set(wxACCEL_CTRL, (int)'C', wxID_COPY);
 	wxAcceleratorTable accel(1, &entry);
 	m_objectCmdList->SetAcceleratorTable(accel);
-	m_objectCmdList->Bind(wxEVT_COMMAND_MENU_SELECTED, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY);
+	m_objectCmdList->Bind(wxEVT_MENU, &FifoPlayerDlg::OnObjectCmdListSelectionCopy, this, wxID_COPY);
 
 	Bind(RECORDING_FINISHED_EVENT, &FifoPlayerDlg::OnRecordingFinished, this);
 	Bind(FRAME_WRITTEN_EVENT, &FifoPlayerDlg::OnFrameWritten, this);
@@ -418,7 +418,7 @@ void FifoPlayerDlg::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 
 			// Wasn't able to save the file, shit's whack, yo.
 			if (!result)
-				PanicAlert("Error saving file");
+				PanicAlertT("Error saving file");
 		}
 	}
 }
@@ -583,7 +583,7 @@ void FifoPlayerDlg::ChangeSearchResult(unsigned int result_idx)
 		m_objectsList->SetSelection(search_results[result_idx].obj_idx);
 		m_objectCmdList->SetSelection(search_results[result_idx].cmd_idx);
 
-		wxCommandEvent ev(wxEVT_COMMAND_LISTBOX_SELECTED);
+		wxCommandEvent ev(wxEVT_LISTBOX);
 		if (prev_frame != m_framesList->GetSelection())
 		{
 			ev.SetInt(m_framesList->GetSelection());
@@ -631,7 +631,7 @@ void FifoPlayerDlg::OnFrameListSelectionChanged(wxCommandEvent& event)
 	}
 
 	// Update object list
-	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+	wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
 	ev.SetInt(-1);
 	OnObjectListSelectionChanged(ev);
 
@@ -762,7 +762,7 @@ void FifoPlayerDlg::OnObjectListSelectionChanged(wxCommandEvent& event)
 		}
 	}
 	// Update command list
-	wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+	wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
 	ev.SetInt(-1);
 	OnObjectCmdListSelectionChanged(ev);
 
@@ -891,7 +891,7 @@ void FifoPlayerDlg::UpdateAnalyzerGui()
 			m_framesList->Append(wxString::Format("Frame %u", (u32)i));
 		}
 
-		wxCommandEvent ev = wxCommandEvent(wxEVT_COMMAND_LISTBOX_SELECTED);
+		wxCommandEvent ev = wxCommandEvent(wxEVT_LISTBOX);
 		ev.SetInt(-1);
 		OnFrameListSelectionChanged(ev);
 	}