From: Carl Hetherington <cth@carlh.net>
Date: Wed, 18 Oct 2017 22:34:31 +0000 (+0100)
Subject: Fix wx3.1 crash.
X-Git-Tag: v2.11.27~4
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=38b811d794ca2c3aec5b80e6e23532d4cb4d4a15;hp=f23a04630806d47bcaf6894271365c49c288ba50;p=dcpomatic.git

Fix wx3.1 crash.
---

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 462f2bdae..fcd7af30a 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -184,7 +184,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 
 		_filters = new wxStaticText (this, wxID_ANY, _("None"), wxDefaultPosition, size);
-		s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+		s->Add (_filters, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 		_filters_button = new wxButton (this, wxID_ANY, _("Edit..."));
 		s->Add (_filters_button, 0, wxALIGN_CENTER_VERTICAL);
 
@@ -204,7 +204,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 
 		/// TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
 		_colour_conversion->Append (S_("Colour|Custom"));
-		s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+		s->Add (_colour_conversion, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
 
 		_edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
 		s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);