From e8a929ac1d0245e5b5ed77e1d6ee2a8124ad90d1 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Sep 2014 22:02:38 -0400 Subject: [PATCH] DolphinWX: Change a wx Printf call to a Format call --- Source/Core/DolphinWX/WiimoteConfigDiag.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp index d0eb9d7ac2..54b9beb6dd 100644 --- a/Source/Core/DolphinWX/WiimoteConfigDiag.cpp +++ b/Source/Core/DolphinWX/WiimoteConfigDiag.cpp @@ -43,8 +43,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputConfig& config for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) { - wxString str; - str.Printf(_("Wiimote %i"), i + 1); + wxString wiimote_str = wxString::Format(_("Wiimote %i"), i + 1); const wxString src_choices[] = { _("None"), _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") }; @@ -57,7 +56,7 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputConfig& config int config_bt_id = wxWindow::NewControlId(); m_wiimote_index_from_conf_bt_id.insert(std::pair(config_bt_id, i)); - wiimote_label[i] = new wxStaticText(this, wxID_ANY, str); + wiimote_label[i] = new wxStaticText(this, wxID_ANY, wiimote_str); wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices); wiimote_source_ch[i]->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::SelectSource, this); wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure")); @@ -69,7 +68,6 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputConfig& config wiimote_configure_bt[i]->Disable(); } - // "Wiimotes" layout wxStaticBoxSizer* const wiimote_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Wiimotes")); wxFlexGridSizer* const wiimote_sizer = new wxFlexGridSizer(3, 5, 5); @@ -169,10 +167,8 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputConfig& config wiimote_source_ch[i]->Disable(); } } - } - // "General Settings" initialization WiiSensBarPos->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData("BT.BAR")); WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData("BT.SENS"));