diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index 1181280747..dfce8e20eb 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -738,19 +738,19 @@ int AppConfig::GeMaxPresetIndex() bool AppConfig::isOkGetPresetTextAndColor( int n, wxString& label, wxColor& c ) { - static const wxString presetNamesAndColors[][2] = + const wxString presetNamesAndColors[][2] = { - { pxE("!Panel:Presets:Name:1", L"Safest"), L"Forest GREEN" }, - { pxE("!Panel:Presets:Name:2", L"Safe (faster)"), L"Dark Green" }, - { pxE("!Panel:Presets:Name:3", L"Balanced"), L"Blue" }, - { pxE("!Panel:Presets:Name:4", L"Aggressive"), L"Purple" }, - { pxE("!Panel:Presets:Name:5", L"Aggressive plus"), L"Orange"}, - { pxE("!Panel:Presets:Name:6", L"Mostly Harmful"), L"Red" } + { _t("Safest"), L"Forest GREEN" }, + { _t("Safe (faster)"), L"Dark Green" }, + { _t("Balanced"), L"Blue" }, + { _t("Aggressive"), L"Purple" }, + { _t("Aggressive plus"), L"Orange"}, + { _t("Mostly Harmful"), L"Red" } }; if( n<0 || n>GeMaxPresetIndex() ) return false; - label = wxString::Format(L"%d - ", n+1) + presetNamesAndColors[n][0]; + label = wxsFormat(L"%d - ", n+1) + presetNamesAndColors[n][0]; c = wxColor(presetNamesAndColors[n][1]); return true; diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp index 7fdbaad893..f3b267281e 100644 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp @@ -152,10 +152,10 @@ void Dialogs::SysConfigDialog::AddPresetsControl() *m_extraButtonSizer += 20; - *m_extraButtonSizer += *m_check_presets | pxMiddle; - *m_extraButtonSizer += *m_slider_presets | pxMiddle; + *m_extraButtonSizer += m_check_presets | pxMiddle; + *m_extraButtonSizer += m_slider_presets | pxMiddle; *m_extraButtonSizer += 5; - *m_extraButtonSizer += *m_msg_preset | pxMiddle; + *m_extraButtonSizer += m_msg_preset | pxMiddle; Connect( m_slider_presets->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) ); Connect( m_slider_presets->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) );