projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.h
diff --git
a/src/wx/timeline_dialog.h
b/src/wx/timeline_dialog.h
index 17ca22c493281ad8dfc3b3a211e78959c295d96b..2f5fa5ec75b23a69eee666feeab0a25476005308 100644
(file)
--- a/
src/wx/timeline_dialog.h
+++ b/
src/wx/timeline_dialog.h
@@
-27,8
+27,11
@@
class Playlist;
class TimelineDialog : public wxDialog
{
public:
- TimelineDialog (
FilmEditor
*, boost::shared_ptr<Film>);
+ TimelineDialog (
ContentPanel
*, boost::shared_ptr<Film>);
private:
+ void snap_toggled ();
+
Timeline _timeline;
+ wxCheckBox* _snap;
};