Stop selecting content in the main window when clicking on the timeline.

This seems not very useful, but mostly it looks horrible on Linux with
the main and timeline windows fighting over which has the focus.

2 files changed, 2 insertions, 6 deletions

diff --git a/src/wx/content_timeline.cc b/src/wx/content_timeline.cc
index 7e8a74ae5..5d7f80b8a 100644
--- a/src/wx/content_timeline.cc
+++ b/src/wx/content_timeline.cc
@@ -67,11 +67,10 @@ using namespace boost::placeholders;
 int const ContentTimeline::_minimum_pixels_per_track = 16;
 
 
-ContentTimeline::ContentTimeline(wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, FilmViewer& viewer)
+ContentTimeline::ContentTimeline(wxWindow* parent, shared_ptr<Film> film, FilmViewer& viewer)
 	: Timeline(parent)
 	, _labels_canvas(new wxScrolledCanvas(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
 	, _main_canvas(new wxScrolledCanvas(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE))
-	, _content_panel(cp)
 	, _film(film)
 	, _viewer(viewer)
 	, _time_axis_view(new TimelineTimeAxisView(*this, 64))
@@ -651,7 +650,6 @@ ContentTimeline::left_up_select(wxMouseEvent& ev)
 		view.first->content()->set_change_signals_frequent(false);
 	}
 
-	_content_panel->set_selection(selected_content());
 	/* Since we may have just set change signals back to `not-frequent', we have to
 	   make sure this position change is signalled, even if the position value has
 	   not changed since the last time it was set (with frequent=true).  This is
diff --git a/src/wx/content_timeline.h b/src/wx/content_timeline.h
index 48dd986cc..2653701b9 100644
--- a/src/wx/content_timeline.h
+++ b/src/wx/content_timeline.h
@@ -35,7 +35,6 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
-class ContentPanel;
 class ContentTimelineView;
 class Film;
 class FilmViewer;
@@ -47,7 +46,7 @@ class TimelineTimeAxisView;
 class ContentTimeline : public Timeline
 {
 public:
-	ContentTimeline(wxWindow *, ContentPanel *, std::shared_ptr<Film>, FilmViewer& viewer);
+	ContentTimeline(wxWindow *, std::shared_ptr<Film>, FilmViewer& viewer);
 
 	std::shared_ptr<Film> film();
 
@@ -120,7 +119,6 @@ private:
 
 	wxScrolledCanvas* _labels_canvas;
 	wxScrolledCanvas* _main_canvas;
-	ContentPanel* _content_panel;
 	std::weak_ptr<Film> _film;
 	FilmViewer& _viewer;
 	ContentTimelineViewList _views;