Fix missing scrollbar in the audio tab on macOS/Windows (#2480).

[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 2fe104563eb16db5d0d35908649bcab1c8f4e50c..6bbc9a51fcae43a89ad9e785ec99e2242fb266cb 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.
 
@@ -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)
@@ -39,49 +47,43 @@ 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 ();
+       _sizer->FitInside(this);
+       Scroll (x, y);
 }
+