projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
timeline_content_view.cc
diff --git
a/src/wx/timeline_content_view.cc
b/src/wx/timeline_content_view.cc
index 481e8100d2b77037c6e854b181a1ccaef0069a7b..79c87f7e000532ce55849bb248cba69a0294efaa 100644
(file)
--- a/
src/wx/timeline_content_view.cc
+++ b/
src/wx/timeline_content_view.cc
@@
-18,11
+18,16
@@
*/
*/
-#include "timeline_content_view.h"
+
#include "timeline.h"
#include "timeline.h"
+#include "timeline_content_view.h"
#include "wx_util.h"
#include "lib/content.h"
#include "wx_util.h"
#include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
+
using std::list;
using std::shared_ptr;
using std::list;
using std::shared_ptr;
@@
-31,6
+36,7
@@
using namespace dcpomatic;
using namespace boost::placeholders;
#endif
using namespace boost::placeholders;
#endif
+
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineView (tl)
, _content (c)
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
: TimelineView (tl)
, _content (c)
@@
-38,6
+44,7
@@
TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c)
_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
}
_content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3));
}
+
dcpomatic::Rect<int>
TimelineContentView::bbox () const
{
dcpomatic::Rect<int>
TimelineContentView::bbox () const
{
@@
-57,6
+64,7
@@
TimelineContentView::bbox () const
);
}
);
}
+
void
TimelineContentView::set_selected (bool s)
{
void
TimelineContentView::set_selected (bool s)
{
@@
-64,36
+72,42
@@
TimelineContentView::set_selected (bool s)
force_redraw ();
}
force_redraw ();
}
+
bool
TimelineContentView::selected () const
{
return _selected;
}
bool
TimelineContentView::selected () const
{
return _selected;
}
+
shared_ptr<Content>
TimelineContentView::content () const
{
return _content.lock ();
}
shared_ptr<Content>
TimelineContentView::content () const
{
return _content.lock ();
}
+
void
TimelineContentView::set_track (int t)
{
_track = t;
}
void
TimelineContentView::set_track (int t)
{
_track = t;
}
+
void
TimelineContentView::unset_track ()
{
_track = boost::optional<int>();
}
void
TimelineContentView::unset_track ()
{
_track = boost::optional<int>();
}
+
boost::optional<int>
TimelineContentView::track () const
{
return _track;
}
boost::optional<int>
TimelineContentView::track () const
{
return _track;
}
+
void
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>> overlaps)
{
void
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>> overlaps)
{
@@
-156,12
+170,14
@@
TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>
gc->PopState ();
}
gc->PopState ();
}
+
int
TimelineContentView::y_pos (int t) const
{
return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
}
int
TimelineContentView::y_pos (int t) const
{
return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
}
+
void
TimelineContentView::content_change (ChangeType type, int p)
{
void
TimelineContentView::content_change (ChangeType type, int p)
{
@@
-176,6
+192,7
@@
TimelineContentView::content_change (ChangeType type, int p)
}
}
}
}
+
wxString
TimelineContentView::label () const
{
wxString
TimelineContentView::label () const
{