From: Carl Hetherington <cth@carlh.net>
Date: Sat, 16 Oct 2021 17:53:26 +0000 (+0200)
Subject: Fix error when editing colours in locales with , as a decimal separator.
X-Git-Tag: checked-for-v2.16.x~247
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8eda9dc238515015e4f2b31067328b97eb7de82e

Fix error when editing colours in locales with , as a decimal separator.
---

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 05ec4a65c..8f52c1ff5 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -29,15 +29,15 @@
 #include <dcp/identity_transfer_function.h>
 #include <dcp/s_gamut3_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
-#include <wx/spinctrl.h>
 #include <wx/gbsizer.h>
+#include <wx/numformatter.h>
+#include <wx/spinctrl.h>
 #include <iostream>
 
 
 using std::cout;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::shared_ptr;
 using std::string;
 using boost::bind;
 using dcp::locale_convert;
@@ -100,7 +100,8 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
         wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
         wxArrayString list;
 
-        wxString n (wxT ("0123456789.-"));
+	wxString n (wxT("0123456789-"));
+	n.Append(wxNumberFormatter::GetDecimalSeparator());
         for (size_t i = 0; i < n.Length(); ++i) {
                 list.Add (n[i]);
         }