Fix typo in string (thanks Michał Tomaszewski)

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 2a74df215fcbdf03588e5e8f5590be04068e0ad6..d6c81a8d2a794b5cf1fa9867f24c3bce379402d2 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,25 +22,28 @@
 #include "content_menu.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
@@ -48,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;
@@ -64,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;
        }
@@ -123,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;