diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-10-12 01:03:28 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-10-14 11:41:18 +0200 |
| commit | 449f383f13e5755c523db11f9adef53b58391025 (patch) | |
| tree | 7751c6ede10455de02aa85dcd00d17109c9d57a6 /src/wx/content_panel.h | |
| parent | 5e640ac3e2f6d5fb079ff65659a1483ddac8672e (diff) | |
Cleanup: use simpler ownership for FilmViewer.
Diffstat (limited to 'src/wx/content_panel.h')
| -rw-r--r-- | src/wx/content_panel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 896c81880..3aeb9db17 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -71,7 +71,7 @@ private: class ContentPanel { public: - ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer); + ContentPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer); ContentPanel (ContentPanel const&) = delete; ContentPanel& operator= (ContentPanel const&) = delete; @@ -109,7 +109,7 @@ public: bool remove_clicked (bool hotkey); void timeline_clicked (); - std::weak_ptr<FilmViewer> film_viewer () const { + FilmViewer& film_viewer() const { return _film_viewer; } @@ -158,7 +158,7 @@ private: wxWindow* _last_selected_tab = nullptr; std::shared_ptr<Film> _film; - std::weak_ptr<FilmViewer> _film_viewer; + FilmViewer& _film_viewer; bool _generally_sensitive; bool _ignore_deselect; bool _no_check_selection; |
