projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve the appearance of things in macOS dark mode in various ways.
[dcpomatic.git]
/
src
/
wx
/
colour_conversion_editor.cc
diff --git
a/src/wx/colour_conversion_editor.cc
b/src/wx/colour_conversion_editor.cc
index 8f52c1ff5d14df90e19487ece25a1fa93ff4f105..4cc9aaa9e9899011a7df692826c21c49c6a1a743 100644
(file)
--- a/
src/wx/colour_conversion_editor.cc
+++ b/
src/wx/colour_conversion_editor.cc
@@
-24,18
+24,19
@@
#include "static_text.h"
#include "wx_util.h"
#include "lib/colour_conversion.h"
#include "static_text.h"
#include "wx_util.h"
#include "lib/colour_conversion.h"
-#include <dcp/locale_convert.h>
#include <dcp/gamma_transfer_function.h>
#include <dcp/identity_transfer_function.h>
#include <dcp/gamma_transfer_function.h>
#include <dcp/identity_transfer_function.h>
-#include <dcp/
s_gamut3_transfer_function
.h>
+#include <dcp/
locale_convert
.h>
#include <dcp/modified_gamma_transfer_function.h>
#include <dcp/modified_gamma_transfer_function.h>
+#include <dcp/s_gamut3_transfer_function.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/gbsizer.h>
#include <wx/numformatter.h>
#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
#include <wx/numformatter.h>
#include <wx/spinctrl.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
-using std::cout;
using std::dynamic_pointer_cast;
using std::make_shared;
using std::string;
using std::dynamic_pointer_cast;
using std::make_shared;
using std::string;
@@
-117,6
+118,7
@@
ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
_yuv_to_rgb = new wxChoice (this, wxID_ANY);
_yuv_to_rgb->Append (_("Rec. 601"));
_yuv_to_rgb->Append (_("Rec. 709"));
_yuv_to_rgb = new wxChoice (this, wxID_ANY);
_yuv_to_rgb->Append (_("Rec. 601"));
_yuv_to_rgb->Append (_("Rec. 709"));
+ _yuv_to_rgb->Append (_("Rec. 2020"));
table->Add (_yuv_to_rgb, wxGBPosition (r, 1));
++r;
table->Add (_yuv_to_rgb, wxGBPosition (r, 1));
++r;