summaryrefslogtreecommitdiff
path: root/src/wx/colour_conversion_editor.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-12-08 00:09:57 +0000
committerCarl Hetherington <cth@carlh.net>2018-12-08 00:09:57 +0000
commit9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94 (patch)
tree674348c2090d46047c62ad6e1fdbb3a0b5c32896 /src/wx/colour_conversion_editor.cc
parentcac2b6f2c8dffcb7271d71fc23c0150c2fe4d6ea (diff)
Basics of in-place i18n with support for wxStaticText and wxCheckBox.
Diffstat (limited to 'src/wx/colour_conversion_editor.cc')
-rw-r--r--src/wx/colour_conversion_editor.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 3a1ffe0bf..3c59dbeed 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -19,7 +19,9 @@
*/
#include "wx_util.h"
+#include "static_text.h"
#include "colour_conversion_editor.h"
+#include "check_box.h"
#include "lib/colour_conversion.h"
#include <dcp/locale_convert.h>
#include <dcp/gamma_transfer_function.h>
@@ -161,7 +163,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
wxFlexGridSizer* rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
- _rgb_to_xyz[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0);
+ _rgb_to_xyz[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0);
rgb_to_xyz_sizer->Add (_rgb_to_xyz[i][j]);
}
}
@@ -174,7 +176,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
subhead (table, this, _("White point adjustment"), r);
- _adjust_white = new wxCheckBox (this, wxID_ANY, _("Adjust white point to"));
+ _adjust_white = new CheckBox (this, _("Adjust white point to"));
table->Add (_adjust_white, wxGBPosition (r, 0));
_adjusted_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
table->Add (_adjusted_white_x, wxGBPosition (r, 1));
@@ -191,7 +193,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
wxFlexGridSizer* bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
- _bradford[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0);
+ _bradford[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0);
bradford_sizer->Add (_bradford[i][j]);
}
}
@@ -202,7 +204,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
subhead (table, this, _("Output gamma correction"), r);
- _output = new wxCheckBox (this, wxID_ANY, _("Inverse 2.6 gamma correction on output"));
+ _output = new CheckBox (this, _("Inverse 2.6 gamma correction on output"));
table->Add (_output, wxGBPosition (r, 0), wxGBSpan (1, 2));
_input_gamma->SetRange (0.1, 4.0);
@@ -236,7 +238,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
wxStaticText *
ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const
{
- wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ wxStaticText* m = new StaticText (parent, text);
wxFont font (*wxNORMAL_FONT);
font.SetWeight (wxFONTWEIGHT_BOLD);
m->SetFont (font);