projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct capitalisation of PulseAudio.
[dcpomatic.git]
/
src
/
wx
/
timeline_text_content_view.h
diff --git
a/src/wx/timeline_text_content_view.h
b/src/wx/timeline_text_content_view.h
index 540a90607ba15ff4f54cf6b3ffef8e7957caecf9..055c841438ca49f0cc8ec58936a32ab970195563 100644
(file)
--- a/
src/wx/timeline_text_content_view.h
+++ b/
src/wx/timeline_text_content_view.h
@@
-20,6
+20,7
@@
#include "timeline_content_view.h"
#include "timeline_content_view.h"
+class TextContent;
class TextContent;
/** @class TimelineTextContentView
class TextContent;
/** @class TimelineTextContentView
@@
-28,10
+29,12
@@
class TextContent;
class TimelineTextContentView : public TimelineContentView
{
public:
class TimelineTextContentView : public TimelineContentView
{
public:
- TimelineTextContentView (Timeline& tl, boost::shared_ptr<Content>
c
);
+ TimelineTextContentView (Timeline& tl, boost::shared_ptr<Content>
, boost::shared_ptr<TextContent>
);
private:
bool active () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
private:
bool active () const;
wxColour background_colour () const;
wxColour foreground_colour () const;
+
+ boost::shared_ptr<TextContent> _caption;
};
};