std::shared_ptr

[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 ac3a02ce95f65ce08f44871030e33703c2635ad2..b4ba5517562588f2282b2b8d7c244fff63e26d45 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.
 
@@ -25,12 +25,14 @@
 #include "lib/compose.hpp"
 #include "lib/log.h"
 #include <wx/notebook.h>
-#include <wx/display.h>
 #include <boost/foreach.hpp>
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        : wxScrolledWindow (p->notebook(), wxID_ANY)
@@ -41,48 +43,24 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
        SetScrollRate (8, 8);
        SetSizer (_sizer);
 
-       /* This is a hack to try and make the content notebook a sensible size; large on big displays but small
-          enough on small displays to leave space for the content area.
-       */
-       wxDisplay display (wxDisplay::GetFromWindow(p->notebook()));
-       wxRect screen = display.GetClientArea();
-       SetMinSize (wxSize(-1, screen.height > 800 ? 600 : 320));
-
        _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
        _sizer->Add (_grid, 0, wxALL, 8);
-
-       _config_connection = Config::instance()->Changed.connect (boost::bind (&ContentSubPanel::config_changed, this, _1));
-}
-
-void
-ContentSubPanel::config_changed (Config::Property p)
-{
-       if (p == Config::INTERFACE_COMPLEXITY) {
-               _grid->Clear ();
-               add_to_grid ();
-               _sizer->Layout ();
-               _grid->Layout ();
-       }
 }
 
 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) {
-               if (why_not.empty()) {
-                       s = _("Cannot reference this DCP.");
-               } else {
-                       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 ();