X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=9c236abebfef4a1b552b5e8b5f084a283f569a1d;hb=9bfa07293928c371d59db2091ba2b7e715ce5994;hp=2fe104563eb16db5d0d35908649bcab1c8f4e50c;hpb=9549ecffd4b63e48a2a3f4c58033691a36eee111;p=dcpomatic.git

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 2fe104563..9c236abeb 100644
--- 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,11 +25,13 @@
 #include "lib/compose.hpp"
 #include "lib/log.h"
 #include <wx/notebook.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)
@@ -39,49 +41,42 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
 {
 	SetScrollRate (8, 8);
 	SetSizer (_sizer);
-	/* This stops the notebook collapsing to near-zero size.  The 600 is a guess. */
-	SetMinSize (wxSize(-1, 600));
 
 	_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)
 {
 	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 ();
 	}
 
+	layout ();
+}
+
+
+void
+ContentSubPanel::layout ()
+{
+	int x;
+	int y;
+	GetViewStart (&x, &y);
+	Scroll (0, 0);
 	_sizer->Layout ();
+	Scroll (x, y);
 }
+