GTK3 KDM window fixes backported from v2.15.x.

[dcpomatic.git] / src / wx / audio_dialog.cc

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index fadda5951aba1af8097b044814976a3cf7ac6f40..6e0d5b9b6d15f7826b37509c99f714710dd41043 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -42,6 +42,9 @@ using boost::bind;
 using boost::optional;
 using boost::const_pointer_cast;
 using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** @param parent Parent window.
  *  @param film Film we are using.
@@ -96,7 +99,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        {
                wxStaticText* m = new StaticText (this, _("Channels"));
                m->SetFont (subheading_font);
-               right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM, 16);
+               right->Add (m, 1, wxTOP | wxBOTTOM, 16);
        }
 
        for (int i = 0; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
@@ -111,7 +114,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        {
                wxStaticText* m = new StaticText (this, _("Type"));
                m->SetFont (subheading_font);
-               right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+               right->Add (m, 1, wxTOP, 16);
        }
 
        wxString const types[] = {
@@ -128,7 +131,7 @@ AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
        {
                wxStaticText* m = new StaticText (this, _("Smoothing"));
                m->SetFont (subheading_font);
-               right->Add (m, 1, wxALIGN_CENTER_VERTICAL | wxTOP, 16);
+               right->Add (m, 1, wxTOP, 16);
        }
 
        _smoothing = new wxSlider (this, wxID_ANY, AudioPlot::max_smoothing / 2, 1, AudioPlot::max_smoothing);