X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_combiner.cc;h=2ef58bb85011fe59bfffd8491d78eb875a50a65c;hb=69326e73b29be371dacbdacd741a0a88a5ef1a5b;hp=40587e23ad4b5f9fae1ea114fadc7ca824751d6b;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc index 40587e23a..2ef58bb85 100644 --- a/src/tools/dcpomatic_combiner.cc +++ b/src/tools/dcpomatic_combiner.cc @@ -65,7 +65,7 @@ public: } - boost::filesystem::path get () const + optional get () const { return boost::filesystem::path(wx_to_std(GetPath())); } @@ -100,8 +100,8 @@ public: boost::bind(&DOMFrame::inputs, this), boost::bind(&DOMFrame::set_inputs, this, _1), &display_string, - false, - true + EditableListTitle::VISIBLE, + EditableListButton::NEW | EditableListButton::REMOVE ); auto output = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);