X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=b4c33f0bc337eeeeecbd726193cd132cc69e4b8f;hb=65bd479a3008fb269925e1ce92e547c863ede73d;hp=46bf77a8ec7ccb80455771af747ab95c062951e4;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 46bf77a8e..b4c33f0bc 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -75,13 +75,13 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		_input_power = new wxSpinCtrlDouble (this);
 		s->Add (_input_power, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
-		add_label_to_sizer (s, this, _("threshold"), true);
+		add_label_to_sizer (s, this, _("threshold"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
 		_input_threshold = new wxTextCtrl (this, wxID_ANY, wxT (""));
 		s->Add (_input_threshold, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
-		add_label_to_sizer (s, this, _("A"), true);
+		add_label_to_sizer (s, this, _("A"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
 		_input_A = new wxTextCtrl (this, wxID_ANY, wxT (""));
 		s->Add (_input_A, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
-		add_label_to_sizer (s, this, _("B"), true);
+		add_label_to_sizer (s, this, _("B"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT);
 		_input_B = new wxTextCtrl (this, wxID_ANY, wxT (""));
 		s->Add (_input_B, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 		table->Add (s, wxGBPosition (r, 1), wxGBSpan (1, 3));
@@ -177,7 +177,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 	subhead (table, this, _("White point adjustment"), r);
 
 	_adjust_white = new CheckBox (this, _("Adjust white point to"));
-	table->Add (_adjust_white, wxGBPosition (r, 0));
+	table->Add (_adjust_white, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	_adjusted_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
 	table->Add (_adjusted_white_x, wxGBPosition (r, 1));
 	_adjusted_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
@@ -267,7 +267,7 @@ ColourConversionEditor::set (ColourConversion conversion)
 		checked_set (_input, 2);
 	}
 
-	_yuv_to_rgb->SetSelection (conversion.yuv_to_rgb ());
+	_yuv_to_rgb->SetSelection (static_cast<int>(conversion.yuv_to_rgb()));
 
 	_ignore_chromaticity_changed = true;