ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from turtleli/fix-change-language 

Fix language panel glitch on Windows
This commit is contained in:
Gregory Hainaut 2015-06-19 15:03:27 +02:00
parent b44bccec6a ac99735b5b
commit cfff229977
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Panels/MiscPanelStuff.cpp
View File

@ -113,7 +113,7 @@ Panels::LanguageSelectionPanel::LanguageSelectionPanel( wxWindow* parent, bool s
compiled[i].Printf( L"%s", m_langs[i].englishName.c_str() ); compiled[i].Printf( L"%s", m_langs[i].englishName.c_str() );
m_picker = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_picker = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
size, compiled.GetPtr(), wxCB_READONLY | wxCB_SORT ); size, compiled.GetPtr(), wxCB_READONLY);
*this += 5; *this += 5;
*this += m_picker | pxSizerFlags::StdSpace(); *this += m_picker | pxSizerFlags::StdSpace();

9
pcsx2/gui/i18n.cpp
View File

@ -59,14 +59,7 @@ LangPackEnumeration::LangPackEnumeration( wxLanguage langId )
LangPackEnumeration::LangPackEnumeration() LangPackEnumeration::LangPackEnumeration()
{ {
wxLangId = wxLANGUAGE_DEFAULT; wxLangId = wxLANGUAGE_DEFAULT;
#if wxMAJOR_VERSION < 3 englishName = L"System Default";
englishName = L"_System Default"; // left-side space forces it to sort to the front of the lists
#else
// It seems wx change its sort algo... It seems non alphanumeric character are removed
englishName = L"0) System Default"; // left-side 0) forces it to sort to the front of the lists
// This one can work too
//englishName = L"A default";
#endif
englishName += _(" (default)"); englishName += _(" (default)");
canonicalName = L"default"; canonicalName = L"default";