projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix alignment of labels on macOS (#2043).
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index b7aaba14d92e16839968d4e20c386e637ec63597..17128e108b1d2640112b06ae26a8f557d49677ba 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,26
+18,26
@@
*/
*/
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+
#include <wx/wx.h>
#include "timeline.h"
#include <wx/wx.h>
#include "timeline.h"
+
class Playlist;
class Playlist;
+
class TimelineDialog : public wxDialog
{
public:
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (ContentPanel *,
boost::shared_ptr<Film>
);
+ TimelineDialog (ContentPanel *,
std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer
);
void set_selection (ContentList selection);
private:
void set_selection (ContentList selection);
private:
- void film_change
d (
Film::Property);
+ void film_change
(ChangeType type,
Film::Property);
void tool_clicked (wxCommandEvent& id);
void tool_clicked (wxCommandEvent& id);
- wxString bitmap_path (std::string name);
-
boost
::weak_ptr<Film> _film;
+
std
::weak_ptr<Film> _film;
Timeline _timeline;
wxToolBar* _toolbar;
boost::signals2::scoped_connection _film_changed_connection;
Timeline _timeline;
wxToolBar* _toolbar;
boost::signals2::scoped_connection _film_changed_connection;