Use the ICU library to sort cinemas rather than strcoll() (part of #2208).

strcoll() just doesn't really seem to work at all on Windows.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index c0b90dfcf..4b7a80141 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -36,6 +36,7 @@ namespace dcpomatic {
 
 
 class Cinema;
+class UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -90,10 +91,13 @@ private:
 	class Comparator : public wxTreeListItemComparator
 	{
 	public:
-		int Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) override
-		{
-			return strcoll(wx_to_std(tree_list->GetItemText(a)).c_str(), wx_to_std(tree_list->GetItemText(b)).c_str());
-		}
+		Comparator ();
+		~Comparator ();
+
+		int Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) override;
+
+	private:
+		UCollator* _collator;
 	};
 
 	Comparator _comparator;