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 fb22b3a22970c243c506ca8a29959f3f5835db2e..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,13 +21,16 @@
 #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/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 class ContentPanel;
 class Content;
 class DCPContent;
+class wxGridBagSizer;
 
 class ContentSubPanel : public wxScrolledWindow
 {
@@ -40,12 +43,20 @@ public:
        /** Called when the list of selected Contents changes */
        virtual void content_selection_changed () = 0;
 
+       wxString name () const {
+               return _name;
+       }
+
 protected:
 
-       void setup_refer_button (wxCheckBox* button, 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;
 };
 
 #endif