why_not in can_reference can just be a string rather than a list of strings.

[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 465288ae20425916517f27243b01708cd6a18556..92eb5a32fd1fca1fc8c351a50b1ad692b77b858d 100644 (file)
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -21,6 +21,9 @@
 #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 <wx/notebook.h>
 #include <boost/foreach.hpp>
 
@@ -29,16 +32,17 @@ using std::string;
 using boost::shared_ptr;
 
 ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name)
-       : wxPanel (p->notebook(), wxID_ANY)
+       : wxScrolledWindow (p->notebook(), wxID_ANY)
        , _parent (p)
        , _sizer (new wxBoxSizer (wxVERTICAL))
 {
        p->notebook()->AddPage (this, name, false);
+       SetScrollRate (-1, 8);
        SetSizer (_sizer);
 }
 
 void
-ContentSubPanel::setup_refer_button (wxCheckBox* button, shared_ptr<DCPContent> dcp, bool can_reference, list<string> why_not) const
+ContentSubPanel::setup_refer_button (wxCheckBox* button, shared_ptr<DCPContent> dcp, bool can_reference, string why_not) const
 {
        button->Enable (can_reference);
 
@@ -46,10 +50,8 @@ ContentSubPanel::setup_refer_button (wxCheckBox* button, shared_ptr<DCPContent>
        if (!dcp) {
                s = _("No DCP selected.");
        } else if (!can_reference) {
-               s = _("Cannot reference this DCP.  ");
-               BOOST_FOREACH (string i, why_not) {
-                       s += std_to_wx(i) + wxT("  ");
-               }
+               s = _("Cannot reference this DCP.  ") + std_to_wx(why_not);
        }
+
        button->SetToolTip (s);
 }