summaryrefslogtreecommitdiff
path: root/src/wx/text_view.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-11 01:25:16 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-11 11:58:15 +0100
commitc370a1f38215f6461cf4366e6885757e7aa2b96a (patch)
tree6d660895988652297260c2434115b903032bc60d /src/wx/text_view.h
parent23b60bec13fa8f0b88c34922a169aa0084d99476 (diff)
Separate out management of controls.
Diffstat (limited to 'src/wx/text_view.h')
-rw-r--r--src/wx/text_view.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index 12cbb6d08..1fe07a999 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -19,12 +19,14 @@
*/
#include "lib/content_text.h"
-#include <boost/shared_ptr.hpp>
#include <wx/wx.h>
#include <wx/listctrl.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
class Decoder;
-class ControlFilmViewer;
+class FilmViewer;
+class Film;
class TextView : public wxDialog
{
@@ -35,7 +37,7 @@ public:
boost::shared_ptr<Content> content,
boost::shared_ptr<TextContent> caption,
boost::shared_ptr<Decoder>,
- ControlFilmViewer* viewer
+ boost::weak_ptr<FilmViewer> viewer
);
private:
@@ -49,5 +51,5 @@ private:
boost::optional<int> _last_count;
std::vector<ContentTime> _start_times;
boost::weak_ptr<Content> _content;
- ControlFilmViewer* _film_viewer;
+ boost::weak_ptr<FilmViewer> _film_viewer;
};