Fix assorted GTK3-related alignment problems.

12 files changed, 66 insertions, 66 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index b3e68f4d1..ab090c1c8 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -219,7 +219,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Wolfgang Woehl"));
 	add_section (_("Tested by"), tested_by);
 
-	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
+	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16));
 
 	overall_sizer->Add (sizer);
 
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 4519c4b7c..666547d16 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -60,7 +60,7 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
 	wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (track_sizer, this, _("Track"), true);
+	add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 
 	sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index 71feeed10..c77123526 100644
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -69,7 +69,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/* Sub-heading: Screens */
 	wxStaticText* h = new StaticText (this, _("Recipients"));
 	h->SetFont (subheading_font);
-	left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 	_recipients = new RecipientsPanel (this);
 	left->Add (_recipients, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 
@@ -77,14 +77,14 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
 	h = new StaticText (this, S_("KDM|Timing"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h);
 	_timing = new KDMTimingPanel (this);
 	right->Add (_timing);
 
 	/* Sub-heading: CPL */
 	h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h);
 
 	vector<CPLSummary> cpls;
 	BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
@@ -99,7 +99,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/* Sub-heading: Output */
 	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 	_output = new DKDMOutputPanel (this);
 	right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index fe80aeae0..2d4ac3fdf 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -288,15 +288,15 @@ private:
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
 		{
-			add_label_to_sizer (table, _panel, _("Default duration of still images"), true);
+			add_label_to_sizer (table, _panel, _("Default duration of still images"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_still_length = new wxSpinCtrl (_panel);
 			s->Add (_still_length);
-			add_label_to_sizer (s, _panel, _("s"), false);
+			add_label_to_sizer (s, _panel, _("s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			table->Add (s, 1);
 		}
 
-		add_label_to_sizer (table, _panel, _("Default directory for new films"), true);
+		add_label_to_sizer (table, _panel, _("Default directory for new films"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 #ifdef DCPOMATIC_USE_OWN_PICKER
 		_directory = new DirPickerCtrl (_panel);
 #else
@@ -304,45 +304,45 @@ private:
 #endif
 		table->Add (_directory, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true);
+		add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_isdcf_metadata_button = new Button (_panel, _("Edit..."));
 		table->Add (_isdcf_metadata_button);
 
-		add_label_to_sizer (table, _panel, _("Default container"), true);
+		add_label_to_sizer (table, _panel, _("Default container"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_container = new wxChoice (_panel, wxID_ANY);
 		table->Add (_container);
 
-		add_label_to_sizer (table, _panel, _("Default content type"), true);
+		add_label_to_sizer (table, _panel, _("Default content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_dcp_content_type = new wxChoice (_panel, wxID_ANY);
 		table->Add (_dcp_content_type);
 
-		add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true);
+		add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
 		table->Add (_dcp_audio_channels);
 
 		{
-			add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true);
+			add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_j2k_bandwidth = new wxSpinCtrl (_panel);
 			s->Add (_j2k_bandwidth);
-			add_label_to_sizer (s, _panel, _("Mbit/s"), false);
+			add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			table->Add (s, 1);
 		}
 
 		{
-			add_label_to_sizer (table, _panel, _("Default audio delay"), true);
+			add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_audio_delay = new wxSpinCtrl (_panel);
 			s->Add (_audio_delay);
-			add_label_to_sizer (s, _panel, _("ms"), false);
+			add_label_to_sizer (s, _panel, _("ms"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			table->Add (s, 1);
 		}
 
-		add_label_to_sizer (table, _panel, _("Default standard"), true);
+		add_label_to_sizer (table, _panel, _("Default standard"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_standard = new wxChoice (_panel, wxID_ANY);
 		table->Add (_standard);
 
-		add_label_to_sizer (table, _panel, _("Default KDM directory"), true);
+		add_label_to_sizer (table, _panel, _("Default KDM directory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 #ifdef DCPOMATIC_USE_OWN_PICKER
 		_kdm_directory = new DirPickerCtrl (_panel);
 #else
@@ -579,23 +579,23 @@ private:
 		table->AddGrowableCol (1, 1);
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
-		add_label_to_sizer (table, _panel, _("Protocol"), true);
+		add_label_to_sizer (table, _panel, _("Protocol"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_protocol = new wxChoice (_panel, wxID_ANY);
 		table->Add (_tms_protocol, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("IP address"), true);
+		add_label_to_sizer (table, _panel, _("IP address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_ip = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_tms_ip, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Target path"), true);
+		add_label_to_sizer (table, _panel, _("Target path"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_path = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_tms_path, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("User name"), true);
+		add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_user = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_tms_user, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Password"), true);
+		add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_password = new PasswordEntry (_panel);
 		table->Add (_tms_password->get_panel(), 1, wxEXPAND);
 
@@ -692,16 +692,16 @@ private:
 		table->AddGrowableCol (1, 1);
 		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
 
-		add_label_to_sizer (table, _panel, _("Outgoing mail server"), true);
+		add_label_to_sizer (table, _panel, _("Outgoing mail server"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		{
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_server = new wxTextCtrl (_panel, wxID_ANY);
 			s->Add (_server, 1, wxEXPAND | wxALL);
-			add_label_to_sizer (s, _panel, _("port"), false);
+			add_label_to_sizer (s, _panel, _("port"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			_port = new wxSpinCtrl (_panel, wxID_ANY);
 			_port->SetRange (0, 65535);
 			s->Add (_port);
-			add_label_to_sizer (s, _panel, _("protocol"), false);
+			add_label_to_sizer (s, _panel, _("protocol"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			_protocol = new wxChoice (_panel, wxID_ANY);
 			/* Make sure this matches the switches in config_changed and port_changed below */
 			_protocol->Append (_("Auto"));
@@ -712,11 +712,11 @@ private:
 			table->Add (s, 1, wxEXPAND | wxALL);
 		}
 
-		add_label_to_sizer (table, _panel, _("User name"), true);
+		add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_user = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_user, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("Password"), true);
+		add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_password = new PasswordEntry (_panel);
 		table->Add (_password->get_panel(), 1, wxEXPAND | wxALL);
 
@@ -828,17 +828,17 @@ private:
 		table->AddGrowableCol (1, 1);
 		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
 
-		add_label_to_sizer (table, _panel, _("Subject"), true);
+		add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_subject = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_subject, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("From address"), true);
+		add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_from = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_from, 1, wxEXPAND | wxALL);
 
 		vector<EditableListColumn> columns;
 		columns.push_back (EditableListColumn(_("Address")));
-		add_label_to_sizer (table, _panel, _("CC addresses"), true);
+		add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_cc = new EditableList<string, EmailDialog> (
 			_panel,
 			columns,
@@ -848,7 +848,7 @@ private:
 			);
 		table->Add (_cc, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("BCC address"), true);
+		add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_bcc = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_bcc, 1, wxEXPAND | wxALL);
 
@@ -956,21 +956,21 @@ private:
 		table->Add (_enable_email, 1, wxEXPAND | wxALL);
 		table->AddSpacer (0);
 
-		add_label_to_sizer (table, _panel, _("Subject"), true);
+		add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_subject = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_subject, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("From address"), true);
+		add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_from = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_from, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("To address"), true);
+		add_label_to_sizer (table, _panel, _("To address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_to = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_to, 1, wxEXPAND | wxALL);
 
 		vector<EditableListColumn> columns;
 		columns.push_back (EditableListColumn(_("Address")));
-		add_label_to_sizer (table, _panel, _("CC addresses"), true);
+		add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_cc = new EditableList<string, EmailDialog> (
 			_panel,
 			columns,
@@ -980,7 +980,7 @@ private:
 			);
 		table->Add (_cc, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("BCC address"), true);
+		add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_bcc = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_bcc, 1, wxEXPAND | wxALL);
 
@@ -1177,32 +1177,32 @@ private:
 		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
 
-		add_label_to_sizer (table, _panel, _("Issuer"), true);
+		add_label_to_sizer (table, _panel, _("Issuer"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_issuer = new wxTextCtrl (_panel, wxID_ANY);
 		_issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
 		table->Add (_issuer, 1, wxALL | wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Creator"), true);
+		add_label_to_sizer (table, _panel, _("Creator"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_creator = new wxTextCtrl (_panel, wxID_ANY);
 		_creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>.  If it is blank, a default value mentioning DCP-o-matic will be used."));
 		table->Add (_creator, 1, wxALL | wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Company name"), true);
+		add_label_to_sizer (table, _panel, _("Company name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_company_name = new wxTextCtrl (_panel, wxID_ANY);
 		_company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
 		table->Add (_company_name, 1, wxALL | wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Product name"), true);
+		add_label_to_sizer (table, _panel, _("Product name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_product_name = new wxTextCtrl (_panel, wxID_ANY);
 		_product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
 		table->Add (_product_name, 1, wxALL | wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Product version"), true);
+		add_label_to_sizer (table, _panel, _("Product version"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_product_version = new wxTextCtrl (_panel, wxID_ANY);
 		_product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
 		table->Add (_product_version, 1, wxALL | wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true);
+		add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
 		_j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment.  If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
 		table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
@@ -1323,7 +1323,7 @@ private:
 		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
 		{
-			add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true);
+			add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_maximum_j2k_bandwidth = new wxSpinCtrl (_panel);
 			s->Add (_maximum_j2k_bandwidth, 1);
@@ -1331,7 +1331,7 @@ private:
 			table->Add (s, 1);
 		}
 
-		add_label_to_sizer (table, _panel, _("Video display mode"), true);
+		add_label_to_sizer (table, _panel, _("Video display mode"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_video_display_mode = new wxChoice (_panel, wxID_ANY);
 		table->Add (_video_display_mode);
 
@@ -1363,7 +1363,7 @@ private:
 		table->AddSpacer (0);
 
 		{
-			add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true);
+			add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 			_frames_in_memory_multiplier = new wxSpinCtrl (_panel);
 			s->Add (_frames_in_memory_multiplier, 1);
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 77f6af6fb..03ade7598 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -69,12 +69,12 @@ JobView::setup ()
 
 	_cancel = new Button (_container, _("Cancel"));
 	_cancel->Bind (wxEVT_BUTTON, &JobView::cancel_clicked, this);
-	_buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
+	_buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
 	_details = new Button (_container, _("Details..."));
 	_details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
 	_details->Enable (false);
-	_buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
+	_buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
 	finish_setup (_container, _buttons);
 
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 86326cbe6..9ff290822 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -74,7 +74,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/* Sub-heading: Screens */
 	wxStaticText* h = new StaticText (this, _("Screens"));
 	h->SetFont (subheading_font);
-	left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 	_screens = new ScreensPanel (this);
 	left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 
@@ -82,14 +82,14 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
 	h = new StaticText (this, S_("KDM|Timing"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h);
 	_timing = new KDMTimingPanel (this);
 	right->Add (_timing);
 
 	/* Sub-heading: CPL */
 	h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h);
 
 	vector<CPLSummary> cpls;
 	BOOST_FOREACH (CPLSummary const & i, film->cpls()) {
@@ -104,7 +104,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film)
 	/* Sub-heading: Output */
 	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
-	right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+	right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 	_output = new KDMOutputPanel (this, film->interop ());
 	right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP);
 
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 6eb14c425..294fdd4df 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -60,7 +60,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 	table->AddGrowableCol (1);
 
-	add_label_to_sizer (table, this, _("KDM type"), true);
+	add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
 	wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new wxChoice (this, wxID_ANY);
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index 2734a9894..ae31e36c3 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -47,7 +47,7 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 #endif
 
 	wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (table, this, _("From"), true);
+	add_label_to_sizer (table, this, _("From"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime from;
 	from.SetToCurrent ();
 	_from_date = new wxDatePickerCtrl (this, wxID_ANY, from, wxDefaultPosition, size);
@@ -66,7 +66,7 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
 #endif
 
-	add_label_to_sizer (table, this, _("until"), true);
+	add_label_to_sizer (table, this, _("until"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime to = from;
 	/* 1 week from now */
 	to.Add (wxDateSpan (0, 0, 1, 0));
diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
index a437c9269..9cadc7f47 100644
--- a/src/wx/send_i18n_dialog.cc
+++ b/src/wx/send_i18n_dialog.cc
@@ -34,15 +34,15 @@ SendI18NDialog::SendI18NDialog (wxWindow* parent)
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	table->AddGrowableCol (1, 1);
 
-	add_label_to_sizer (table, this, _("Your name"), true);
+	add_label_to_sizer (table, this, _("Your name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_name = new wxTextCtrl (this, wxID_ANY);
 	table->Add (_name, 0, wxEXPAND);
 
-	add_label_to_sizer (table, this, _("Your email"), true);
+	add_label_to_sizer (table, this, _("Your email"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_email = new wxTextCtrl (this, wxID_ANY);
 	table->Add (_email, 0, wxEXPAND);
 
-	add_label_to_sizer (table, this, _("Language"), true);
+	add_label_to_sizer (table, this, _("Language"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_language = new wxTextCtrl (this, wxID_ANY);
 	table->Add (_language, 0, wxEXPAND);
 
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index dc57d8b2e..63d6d4f84 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -52,10 +52,10 @@ TimePickerSpin::TimePickerSpin (wxWindow* parent, wxDateTime time)
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 	_hours = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-	sizer->Add (_hours, 1, wxEXPAND | wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+	sizer->Add (_hours, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 	sizer->Add (new StaticText (this, wxT (":")), 0, wxALIGN_CENTER_VERTICAL);
 	_minutes = new wxSpinCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-	sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+	sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	SetSizerAndFit (sizer);
 
@@ -101,10 +101,10 @@ TimePickerText::TimePickerText (wxWindow* parent, wxDateTime time)
 
 	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
 	_hours = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-	sizer->Add (_hours, 1, wxEXPAND | wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+	sizer->Add (_hours, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 	sizer->Add (new StaticText (this, wxT (":")), 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, 4);
 	_minutes = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size);
-	sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+	sizer->Add (_minutes, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	SetSizerAndFit (sizer);
 
diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index f3d4a7aa5..510d373c6 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -57,10 +57,10 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 	_component->Append (wxT ("X"));
 	_component->Append (wxT ("Y"));
 	_component->Append (wxT ("Z"));
-	add_label_to_sizer (controls, this, _("Component"), true);
+	add_label_to_sizer (controls, this, _("Component"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	controls->Add (_component, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
-	add_label_to_sizer (controls, this, _("Contrast"), true);
+	add_label_to_sizer (controls, this, _("Contrast"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	_contrast = new wxSlider (this, wxID_ANY, 0, 0, 256);
 	controls->Add (_contrast, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
 
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index f12671786..bb4c08a64 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -48,7 +48,7 @@ class PasswordEntry;
 #define DCPOMATIC_SIZER_GAP 8
 #define DCPOMATIC_DIALOG_BORDER 12
 
-/** Spacing to use between buttons in a vertical line */
+/** Spacing to use between buttons in a vertical/horizontal line */
 #if defined(DCPOMATIC_OSX) | defined(__WXGTK3__)
 #define DCPOMATIC_BUTTON_STACK_GAP 2
 #else