diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-06-07 15:32:29 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-06-07 20:38:36 +1200 |
| commit | 1aa829c03c4c31d06b4386c5fc8311bfb9d56d00 (patch) | |
| tree | 8c035271cddbbe69352ac061fc131eed69ebc046 /Source/Core/DolphinWX/Config/GeneralConfigPane.cpp | |
| parent | b0afb08170c856afdc78c182c7d0afb3a2d578e4 (diff) | |
Fixed translation of strings at runtime.
Static strings can not be translated until wxLocale is initialised.
This reverts commit 0004b6004b726535275ceb96c8493c195fd79401.
Conflicts:
Source/Core/DolphinWX/VideoConfigDiag.cpp
Diffstat (limited to 'Source/Core/DolphinWX/Config/GeneralConfigPane.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Config/GeneralConfigPane.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp index a8a734ee3d..9c8c5e361f 100644 --- a/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp +++ b/Source/Core/DolphinWX/Config/GeneralConfigPane.cpp @@ -18,13 +18,10 @@ #include "DolphinWX/Config/GeneralConfigPane.h" #include "DolphinWX/Debugger/CodeWindow.h" - -struct CPUCore +GeneralConfigPane::GeneralConfigPane(wxWindow* parent, wxWindowID id) + : wxPanel(parent, id) { - int CPUid; - wxString name; -}; -static const CPUCore cpu_cores[] = { + cpu_cores = { { 0, _("Interpreter (VERY slow)") }, #ifdef _M_X86_64 { 1, _("JIT Recompiler (recommended)") }, @@ -34,11 +31,8 @@ static const CPUCore cpu_cores[] = { #elif defined(_M_ARM_64) { 4, _("Arm64 JIT (experimental)") }, #endif -}; + }; -GeneralConfigPane::GeneralConfigPane(wxWindow* parent, wxWindowID id) - : wxPanel(parent, id) -{ InitializeGUI(); LoadGUIValues(); RefreshGUI(); |