X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcontent_panel.h;h=d6c81a8d2a794b5cf1fa9867f24c3bce379402d2;hb=aa8bb6ae4fe4f3bb113a5d304429937f25e30191;hp=aca8181184b596c7d02b2c9391f3bd984f9b0f6e;hpb=b249700e1da7dd6631a8b4440587f4093a2bdef1;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index aca818118..d6c81a8d2 100644
--- 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;
@@ -126,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;