From 306b996ee0bef42af3d5c7fbc6789c5d9301e68c Mon Sep 17 00:00:00 2001 From: twanvl Date: Wed, 12 Dec 2007 16:21:35 +0000 Subject: [PATCH] fixed sorting of locale combo box made update_checker compile in vc git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@771 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/gui/preferences_window.cpp | 7 ++++++- src/gui/update_checker.cpp | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gui/preferences_window.cpp b/src/gui/preferences_window.cpp index 7778b228..a889fa38 100644 --- a/src/gui/preferences_window.cpp +++ b/src/gui/preferences_window.cpp @@ -127,14 +127,19 @@ END_EVENT_TABLE () // ----------------------------------------------------------------------------- : Preferences page : global +bool compare_package_name(const PackagedP& a, const PackagedP& b) { + return a->name() < b->name(); +} + GlobalPreferencesPage::GlobalPreferencesPage(Window* parent) : PreferencesPage(parent) { // init controls - language = new wxComboBox(this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY | wxCB_SORT); + language = new wxComboBox(this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); // set values vector locales; ::packages.findMatching(_("*.mse-locale"), locales); + sort(locales.begin(), locales.end(), compare_package_name); int n = 0; FOR_EACH(package, locales) { language->Append(package->name() + _(": ") + package->full_name, package.get()); diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp index 7f1e14e2..ddeb81df 100644 --- a/src/gui/update_checker.cpp +++ b/src/gui/update_checker.cpp @@ -30,6 +30,8 @@ DECLARE_POINTER_TYPE(VersionData); DECLARE_TYPEOF_COLLECTION(PackageVersionDataP); DECLARE_TYPEOF_COLLECTION(PackageDependencyP); +DECLARE_TYPEOF(list); +DECLARE_TYPEOF(set); // ----------------------------------------------------------------------------- : Update data