projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new macOS preferences icons.
[dcpomatic.git]
/
src
/
wx
/
timeline_text_content_view.cc
diff --git
a/src/wx/timeline_text_content_view.cc
b/src/wx/timeline_text_content_view.cc
index 30158941c2fe711536ebde5ed9d7feafd8675e12..1345ea5e49457950f4abea14fc9ef571285dfa7d 100644
(file)
--- a/
src/wx/timeline_text_content_view.cc
+++ b/
src/wx/timeline_text_content_view.cc
@@
-19,12
+19,12
@@
*/
#include "timeline_text_content_view.h"
*/
#include "timeline_text_content_view.h"
-#include "lib/
caption
_content.h"
+#include "lib/
text
_content.h"
#include "lib/content.h"
using boost::shared_ptr;
#include "lib/content.h"
using boost::shared_ptr;
-TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c, shared_ptr<
Caption
Content> caption)
+TimelineTextContentView::TimelineTextContentView (Timeline& tl, shared_ptr<Content> c, shared_ptr<
Text
Content> caption)
: TimelineContentView (tl, c)
, _caption (caption)
{
: TimelineContentView (tl, c)
, _caption (caption)
{
@@
-54,7
+54,5
@@
TimelineTextContentView::foreground_colour () const
bool
TimelineTextContentView::active () const
{
bool
TimelineTextContentView::active () const
{
- shared_ptr<Content> c = _content.lock ();
- DCPOMATIC_ASSERT (c);
return _caption->use();
}
return _caption->use();
}