projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4d03568
)
Fix error when editing colours in locales with , as a decimal separator.
author
Carl Hetherington
<cth@carlh.net>
Sat, 16 Oct 2021 17:53:26 +0000
(19:53 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 16 Oct 2021 17:53:26 +0000
(19:53 +0200)
src/wx/colour_conversion_editor.cc
patch
|
blob
|
history
diff --git
a/src/wx/colour_conversion_editor.cc
b/src/wx/colour_conversion_editor.cc
index 05ec4a65c1c26efc3666c83c4a49b005e514dba9..8f52c1ff5d14df90e19487ece25a1fa93ff4f105 100644
(file)
--- 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 <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/gbsizer.h>
+#include <wx/numformatter.h>
+#include <wx/spinctrl.h>
#include <iostream>
using std::cout;
using std::dynamic_pointer_cast;
using std::make_shared;
#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;
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;
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]);
}
for (size_t i = 0; i < n.Length(); ++i) {
list.Add (n[i]);
}