Supporters update.

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

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index ebbdf5b60e254021165eaa54b53ad491fb21413b..c750ae852d982c6f327cee7fbafc4f0dc4b17f53 100644 (file)
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -23,7 +23,9 @@
 #define DCPOMATIC_CONTENT_MENU_H
 
 
+#include "auto_crop_dialog.h"
 #include "timeline_content_view.h"
+#include "wx_ptr.h"
 #include "lib/types.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
@@ -32,7 +34,6 @@ LIBDCP_ENABLE_WARNINGS
 #include <memory>
 
 
-class AutoCropDialog;
 class DCPContent;
 class Film;
 class FilmViewer;
@@ -42,7 +43,7 @@ class Job;
 class ContentMenu
 {
 public:
-       ContentMenu (wxWindow* parent, std::weak_ptr<FilmViewer> viewer);
+       ContentMenu(wxWindow* parent, FilmViewer& viewer);
 
        ContentMenu (ContentMenu const &) = delete;
        ContentMenu& operator= (ContentMenu const &) = delete;
@@ -69,7 +70,7 @@ private:
        std::weak_ptr<Film> _film;
        wxWindow* _parent;
        bool _pop_up_open;
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        ContentList _content;
        TimelineContentViewList _views;
        wxMenuItem* _repeat;
@@ -85,7 +86,7 @@ private:
        wxMenuItem* _set_dcp_settings;
        wxMenuItem* _remove;
 
-       AutoCropDialog* _auto_crop_dialog = nullptr;
+       wx_ptr<AutoCropDialog> _auto_crop_dialog;
        boost::signals2::scoped_connection _auto_crop_config_connection;
        boost::signals2::scoped_connection _auto_crop_viewer_connection;
 };