Remove the "simple" UI (#1868).

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

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index dc6c1d2b8666ba94b1f6da86f0824f5e2a65ba2c..1a92c0dcd3b1e03955bb33d6daca342b9bda9ab4 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -30,31 +30,37 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        : wxScrolledWindow (p->notebook(), wxID_ANY)
        , _parent (p)
        , _sizer (new wxBoxSizer (wxVERTICAL))
+       , _name (name)
 {
-       p->notebook()->AddPage (this, name, false);
-       SetScrollRate (-1, 8);
+       SetScrollRate (8, 8);
        SetSizer (_sizer);
+
+       _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       _sizer->Add (_grid, 0, wxALL, 8);
 }
 
 void
-ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr<DCPContent> dcp, bool can_reference, string why_not) const
+ContentSubPanel::setup_refer_button (wxCheckBox* button, wxStaticText* note, shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot) const
 {
        button->Enable (can_reference);
 
-       wxString s;
        if (dcp && !can_reference) {
-               s = _("Cannot reference this DCP.  ") + std_to_wx(why_not);
+               note->SetLabel (cannot);
+       } else {
+               note->SetLabel (wxT(""));
        }
 
-       note->SetLabel (s);
        note->Wrap (400);
 
-       if (s.IsEmpty ()) {
+       if (cannot.IsEmpty()) {
                note->Hide ();
        } else {
                note->Show ();