projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
It seems wrong to Destroy() these widgets as I think the parent will do it.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 24c046a6a2faaabebb85400972fcb339ff0e36fe..a2c4f0f2fda7d56fe5be086c2323db1e07ccbc0c 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-18,11
+18,11
@@
*/
*/
+
#include "content_menu.h"
#include "timeline_content_view.h"
#include "lib/film.h"
#include "lib/rect.h"
#include "content_menu.h"
#include "timeline_content_view.h"
#include "lib/film.h"
#include "lib/rect.h"
-#include "lib/util.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
@@
-42,7
+42,7
@@
class TimelineView;
class Timeline : public wxPanel
{
public:
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>,
std::weak_ptr<FilmViewer>
viewer);
+ Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>,
FilmViewer&
viewer);
std::shared_ptr<const Film> film () const;
std::shared_ptr<const Film> film () const;
@@
-118,7
+118,7
@@
private:
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
std::weak_ptr<Film> _film;
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
std::weak_ptr<Film> _film;
-
std::weak_ptr<FilmViewer>
_viewer;
+
FilmViewer&
_viewer;
TimelineViewList _views;
std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
std::shared_ptr<TimelineReelsView> _reels_view;
TimelineViewList _views;
std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
std::shared_ptr<TimelineReelsView> _reels_view;