Fix strange layout problems with the content sub panels (#2059).

[dcpomatic.git] / src / wx / content_sub_panel.h

diff --git a/src/wx/content_sub_panel.h b/src/wx/content_sub_panel.h
index bb0e937a1add8b78f85829f4de44bec1109f4a10..2a7bc4f75e05b9800fa48b115d7d2d153c3a5d59 100644 (file)
--- a/src/wx/content_sub_panel.h
+++ b/src/wx/content_sub_panel.h
@@ -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.
 
@@ -21,10 +21,11 @@
 #ifndef DCPOMATIC_CONTENT_SUB_PANEL_H
 #define DCPOMATIC_CONTENT_SUB_PANEL_H
 
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class ContentPanel;
 class Content;
@@ -48,16 +49,14 @@ public:
 
 protected:
 
-       void setup_refer_button (wxCheckBox* button, wxStaticText* note, boost::shared_ptr<DCPContent> dcp, bool can_reference, std::string why_not) const;
+       void setup_refer_button (wxCheckBox* button, wxStaticText* note, std::shared_ptr<DCPContent> dcp, bool can_reference, wxString cannot);
+       void layout ();
        virtual void add_to_grid () = 0;
 
        ContentPanel* _parent;
        wxSizer* _sizer;
        wxGridBagSizer* _grid;
        wxString _name;
-
-private:
-       void config_changed (Config::Property);
 };
 
 #endif