X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=666701168ffa55beae283b701d252c9e838f97b8;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=86326cbe6127d399cc040fc84156d5c7b68727d5;hpb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 86326cbe6..666701168 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -48,7 +48,7 @@ using std::cout; using std::vector; using std::make_pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; using boost::optional; #if BOOST_VERSION >= 106100 @@ -74,7 +74,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr 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 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 cpls; BOOST_FOREACH (CPLSummary const & i, film->cpls()) { @@ -104,7 +104,7 @@ KDMDialog::KDMDialog (wxWindow* parent, shared_ptr 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);