X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=8277b7c4250a1013e85cc3e0055ea407ff11f301;hb=63c1bbc1ba177600523b2257223070cc2dbde7b7;hp=33a7866e4db7c67b39f8fd08e7470c7ba5b98940;hpb=9d045fa4e19d6b9a3f2ffcd67a5b69de823595e6;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 33a7866e4..8277b7c42 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,19 @@
 
 */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
+#include "content_menu.h"
 #include "lib/types.h"
 #include "lib/film.h"
-#include "content_menu.h"
+#include <wx/splitter.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 class wxNotebook;
 class wxPanel;
 class wxSizer;
 class wxListCtrl;
 class wxListEvent;
+class wxSplitterWindow;
 class TimelineDialog;
 class FilmEditor;
 class ContentSubPanel;
@@ -42,7 +44,7 @@ class FilmViewer;
 class ContentPanel : public boost::noncopyable
 {
 public:
-	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, FilmViewer* viewer);
+	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
 
 	boost::shared_ptr<Film> film () const {
 		return _film;
@@ -56,8 +58,8 @@ public:
 	void film_changed (Film::Property p);
 	void film_content_changed (int p);
 
-	wxPanel* panel () const {
-		return _panel;
+	wxWindow* window () const {
+		return _splitter;
 	}
 
 	wxNotebook* notebook () const {
@@ -74,7 +76,7 @@ public:
 	bool remove_clicked (bool hotkey);
 	void timeline_clicked ();
 
-	FilmViewer* film_viewer () const {
+	boost::weak_ptr<FilmViewer> film_viewer () const {
 		return _film_viewer;
 	}
 
@@ -98,8 +100,7 @@ private:
 	void add_files (std::list<boost::filesystem::path>);
 	std::list<ContentSubPanel *> panels () const;
 
-	wxPanel* _panel;
-	wxSizer* _sizer;
+	wxSplitterWindow* _splitter;
 	wxNotebook* _notebook;
 	wxListCtrl* _content;
 	wxButton* _add_file;
@@ -120,7 +121,7 @@ private:
 	wxWindow* _last_selected_tab;
 
 	boost::shared_ptr<Film> _film;
-	FilmViewer* _film_viewer;
+	boost::weak_ptr<FilmViewer> _film_viewer;
 	bool _generally_sensitive;
 	bool _ignore_deselect;
 };