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

diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 92eb5a32f..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,33 +25,58 @@
 #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)
 	, _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, 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) {
-		s = _("No DCP selected.");
-	} else if (!can_reference) {
-		s = _("Cannot reference this DCP.  ") + std_to_wx(why_not);
+	if (dcp && !can_reference) {
+		note->SetLabel (cannot);
+	} else {
+		note->SetLabel (wxT(""));
 	}
 
-	button->SetToolTip (s);
+	note->Wrap (400);
+
+	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);
 }
+