From 29463b9e5290e0c1b1425504b5a31075ff52c43f Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Sun, 14 Jun 2015 17:11:50 +0100 Subject: [PATCH 1/2] Fix language panel glitch on Windows On Windows, the languages displayed in the dropdown box of the language panel selector are not in alphabetical order. This is caused by the CBS_SORT window style, which is set by wxCB_SORT, having a ridiculous sorting order. Remove the option to fix the language order and sort a minor UI glitch. --- pcsx2/gui/Panels/MiscPanelStuff.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcsx2/gui/Panels/MiscPanelStuff.cpp b/pcsx2/gui/Panels/MiscPanelStuff.cpp index 72011deaa8..914128777d 100644 --- a/pcsx2/gui/Panels/MiscPanelStuff.cpp +++ b/pcsx2/gui/Panels/MiscPanelStuff.cpp @@ -113,7 +113,7 @@ Panels::LanguageSelectionPanel::LanguageSelectionPanel( wxWindow* parent, bool s compiled[i].Printf( L"%s", m_langs[i].englishName.c_str() ); 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 += m_picker | pxSizerFlags::StdSpace(); From ac99735b5ba17f778eb99edc61731e00790c2267 Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Thu, 18 Jun 2015 20:55:02 +0100 Subject: [PATCH 2/2] Revert "pcsx2:gui:wx3: wrong order of language in wizard" This reverts commit 8afd2edd1d00bb6846ad0959fe8500582897b4da and removes the leading space from "System Default". --- pcsx2/gui/i18n.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pcsx2/gui/i18n.cpp b/pcsx2/gui/i18n.cpp index 67f2ff0db6..96c96071aa 100644 --- a/pcsx2/gui/i18n.cpp +++ b/pcsx2/gui/i18n.cpp @@ -59,14 +59,7 @@ LangPackEnumeration::LangPackEnumeration( wxLanguage langId ) LangPackEnumeration::LangPackEnumeration() { wxLangId = wxLANGUAGE_DEFAULT; -#if wxMAJOR_VERSION < 3 - 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 = L"System Default"; englishName += _(" (default)"); canonicalName = L"default";