X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.h;h=124fd6b94983d17a825073df7f339d93d8d46ffd;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=ab11a894b95f3dd1e09b7da22239f91154f2646d;hpb=15723e1ba0574d4c62458321e9b6d64236e7e429;p=dcpomatic.git

diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index ab11a894b..124fd6b94 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,7 +22,6 @@
 #include "lib/types.h"
 #include "lib/film.h"
 #include <wx/splitter.h>
-#include <boost/shared_ptr.hpp>
 #include <list>
 
 class wxNotebook;
@@ -45,14 +44,7 @@ class FilmViewer;
 class LimitedSplitter : public wxSplitterWindow
 {
 public:
-	LimitedSplitter (wxWindow* parent)
-		: wxSplitterWindow (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_NOBORDER | wxSP_3DSASH | wxSP_LIVE_UPDATE)
-	{
-		/* This value doesn't really mean much but we just want to stop double-click on the
-		   divider from shrinking the bottom panel (#1601).
-		*/
-		SetMinimumPaneSize (64);
-	}
+	LimitedSplitter (wxWindow* parent);
 
 	bool OnSashPositionChange (int new_position)
 	{
@@ -61,21 +53,27 @@ public:
 	}
 
 	void first_shown (wxWindow* top, wxWindow* bottom);
+
+private:
+	void sized (wxSizeEvent& ev);
+
+	bool _first_shown;
+	int const _top_panel_minimum_size;
 };
 
 
 class ContentPanel : public boost::noncopyable
 {
 public:
-	ContentPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+	ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-	boost::shared_ptr<Film> film () const {
+	std::shared_ptr<Film> film () const {
 		return _film;
 	}
 
-	void set_film (boost::shared_ptr<Film>);
+	void set_film (std::shared_ptr<Film>);
 	void set_general_sensitivity (bool s);
-	void set_selection (boost::weak_ptr<Content>);
+	void set_selection (std::weak_ptr<Content>);
 	void set_selection (ContentList cl);
 
 	void film_changed (Film::Property p);
@@ -101,7 +99,7 @@ public:
 	bool remove_clicked (bool hotkey);
 	void timeline_clicked ();
 
-	boost::weak_ptr<FilmViewer> film_viewer () const {
+	std::weak_ptr<FilmViewer> film_viewer () const {
 		return _film_viewer;
 	}
 
@@ -138,15 +136,15 @@ private:
 	wxButton* _timeline;
 	VideoPanel* _video_panel;
 	AudioPanel* _audio_panel;
-	TextPanel* _text_panel[TEXT_COUNT];
+	TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
 	TimingPanel* _timing_panel;
 	ContentMenu* _menu;
 	TimelineDialog* _timeline_dialog;
 	wxNotebook* _parent;
 	wxWindow* _last_selected_tab;
 
-	boost::shared_ptr<Film> _film;
-	boost::weak_ptr<FilmViewer> _film_viewer;
+	std::shared_ptr<Film> _film;
+	std::weak_ptr<FilmViewer> _film_viewer;
 	bool _generally_sensitive;
 	bool _ignore_deselect;
 	bool _no_check_selection;