Use wx_ptr more.

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

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 1d303718031e6e1082bb4e8b76772d553b31504d..88686067221253ea674bf66ef611727cbc101706 100644 (file)
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,7 +22,7 @@
 #include "content_menu.h"
 #include "lib/enum_indexed_vector.h"
 #include "lib/film.h"
-#include "lib/types.h"
+#include "lib/text_type.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/splitter.h>
@@ -31,11 +31,12 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioPanel;
+class ContentListCtrl;
 class ContentSubPanel;
 class Film;
 class FilmEditor;
 class FilmViewer;
-class LimitedSplitter;
+class LimitedContentPanelSplitter;
 class TextPanel;
 class TimelineDialog;
 class TimingPanel;
@@ -108,6 +109,7 @@ private:
        void later_clicked ();
        void right_click (wxListEvent &);
        void files_dropped (wxDropFilesEvent &);
+       boost::optional<boost::filesystem::path> add_files_override_path() const;
 
        void setup ();
        void setup_sensitivity ();
@@ -115,10 +117,10 @@ private:
 
        std::list<ContentSubPanel *> panels () const;
 
-       LimitedSplitter* _splitter;
+       LimitedContentPanelSplitter* _splitter;
        wxPanel* _top_panel;
        wxNotebook* _notebook;
-       wxListCtrl* _content;
+       ContentListCtrl* _content;
        wxButton* _add_file;
        wxButton* _add_folder;
        wxButton* _add_dcp;
@@ -131,7 +133,7 @@ private:
        EnumIndexedVector<TextPanel*, TextType> _text_panel;
        TimingPanel* _timing_panel;
        ContentMenu* _menu;
-       TimelineDialog* _timeline_dialog = nullptr;
+       wx_ptr<TimelineDialog> _timeline_dialog;
        wxNotebook* _parent;
        wxWindow* _last_selected_tab = nullptr;