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 3aeb9db17328475984f04bab805cbee9e62b6dbb..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,10 +31,12 @@ LIBDCP_ENABLE_WARNINGS
 
 
 class AudioPanel;
+class ContentListCtrl;
 class ContentSubPanel;
 class Film;
 class FilmEditor;
 class FilmViewer;
+class LimitedContentPanelSplitter;
 class TextPanel;
 class TimelineDialog;
 class TimingPanel;
@@ -47,27 +49,6 @@ class wxSizer;
 class wxSplitterWindow;
 
 
-class LimitedSplitter : public wxSplitterWindow
-{
-public:
-       LimitedSplitter (wxWindow* parent);
-
-       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;
-       }
-
-       void first_shown (wxWindow* top, wxWindow* bottom);
-
-private:
-       void sized (wxSizeEvent& ev);
-
-       bool _first_shown;
-       int const _top_panel_minimum_size;
-};
-
-
 class ContentPanel
 {
 public:
@@ -91,9 +72,7 @@ public:
 
        void first_shown ();
 
-       wxWindow* window () const {
-               return _splitter;
-       }
+       wxWindow* window () const;
 
        wxNotebook* notebook () const {
                return _notebook;
@@ -130,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 ();
@@ -137,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;
@@ -153,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;