Supporters update.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 6a9ef3f4a561724cc442b2931c4ceaaa7a12dcff..d6c81a8d2a794b5cf1fa9867f24c3bce379402d2 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,27 +18,32 @@
 
 */
 
+
 #include "content_menu.h"
-#include "lib/types.h"
 #include "lib/film.h"
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/splitter.h>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 
+
+class AudioPanel;
+class ContentSubPanel;
+class Film;
+class FilmEditor;
+class FilmViewer;
+class TextPanel;
+class TimelineDialog;
+class TimingPanel;
+class VideoPanel;
+class wxListCtrl;
+class wxListEvent;
 class wxNotebook;
 class wxPanel;
 class wxSizer;
-class wxListCtrl;
-class wxListEvent;
 class wxSplitterWindow;
-class TimelineDialog;
-class FilmEditor;
-class ContentSubPanel;
-class TextPanel;
-class VideoPanel;
-class AudioPanel;
-class TimingPanel;
-class Film;
-class FilmViewer;
 
 
 class LimitedSplitter : public wxSplitterWindow
@@ -46,7 +51,7 @@ class LimitedSplitter : public wxSplitterWindow
 public:
        LimitedSplitter (wxWindow* parent);
 
-       bool OnSashPositionChange (int new_position)
+       bool OnSashPositionChange (int new_position) override
        {
                /* Try to stop the top bit of the splitter getting so small that buttons disappear */
                return new_position > 220;
@@ -62,11 +67,14 @@ private:
 };
 
 
-class ContentPanel : public boost::noncopyable
+class ContentPanel
 {
 public:
        ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
+       ContentPanel (ContentPanel const&) = delete;
+       ContentPanel& operator= (ContentPanel const&) = delete;
+
        std::shared_ptr<Film> film () const {
                return _film;
        }
@@ -75,6 +83,7 @@ public:
        void set_general_sensitivity (bool s);
        void set_selection (std::weak_ptr<Content>);
        void set_selection (ContentList cl);
+       void select_all ();
 
        void film_changed (Film::Property p);
        void film_content_changed (int p);
@@ -120,7 +129,7 @@ private:
        void setup ();
        void setup_sensitivity ();
 
-       void add_files (std::list<boost::filesystem::path>);
+       void add_files (std::vector<boost::filesystem::path>);
        std::list<ContentSubPanel *> panels () const;
 
        LimitedSplitter* _splitter;
@@ -134,14 +143,14 @@ private:
        wxButton* _earlier;
        wxButton* _later;
        wxButton* _timeline;
-       VideoPanel* _video_panel;
-       AudioPanel* _audio_panel;
-       TextPanel* _text_panel[TEXT_COUNT];
+       VideoPanel* _video_panel = nullptr;
+       AudioPanel* _audio_panel = nullptr;
+       TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
        TimingPanel* _timing_panel;
        ContentMenu* _menu;
-       TimelineDialog* _timeline_dialog;
+       TimelineDialog* _timeline_dialog = nullptr;
        wxNotebook* _parent;
-       wxWindow* _last_selected_tab;
+       wxWindow* _last_selected_tab = nullptr;
 
        std::shared_ptr<Film> _film;
        std::weak_ptr<FilmViewer> _film_viewer;