X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_sub_panel.cc;h=6bbc9a51fcae43a89ad9e785ec99e2242fb266cb;hp=a30d3cfce061155bb7fb5ee6c72e183f7649b7ed;hb=21db1bc7fbe778847e4dc2a7d6858cb6b43bac27;hpb=bfc79f85fa979a9c3b0f17f2040e0ae0181cb733

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index a30d3cfce..6bbc9a51f 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.
 
@@ -18,18 +18,26 @@
 
 */
 
+
 #include "content_sub_panel.h"
 #include "content_panel.h"
 #include "wx_util.h"
 #include "lib/dcp_content.h"
 #include "lib/compose.hpp"
 #include "lib/log.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
-#include <boost/foreach.hpp>
+LIBDCP_ENABLE_WARNINGS
+
 
 using std::list;
+using std::shared_ptr;
 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)
@@ -37,32 +45,45 @@ ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
 	, _sizer (new wxBoxSizer (wxVERTICAL))
 	, _name (name)
 {
-	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)
 {
 	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 ();
+	_sizer->FitInside(this);
+	Scroll (x, y);
 }
+