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_time_axis_view.cc
diff --git
a/src/wx/timeline_time_axis_view.cc
b/src/wx/timeline_time_axis_view.cc
index 1d7aefb738d4df0bcdf758bdfec9a2fa5343749a..046ddaf3f2b301f7f4495cc2dd18e7d451465d34 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-18,13
+18,20
@@
*/
*/
-#include "timeline_time_axis_view.h"
#include "timeline.h"
#include "timeline.h"
+#include "timeline_time_axis_view.h"
#include "wx_util.h"
#include "wx_util.h"
-#include <wx/wx.h>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
+using std::cout;
using std::list;
using std::list;
+using namespace dcpomatic;
+
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
@@
-33,12
+40,14
@@
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
}
}
+
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
}
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
}
+
/** @param y y position in tracks (not pixels) */
void
TimelineTimeAxisView::set_y (int y)
/** @param y y position in tracks (not pixels) */
void
TimelineTimeAxisView::set_y (int y)
@@
-47,6
+56,7
@@
TimelineTimeAxisView::set_y (int y)
force_redraw ();
}
force_redraw ();
}
+
void
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
{
void
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
{
@@
-60,7
+70,7
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
double const mark_interval = calculate_mark_interval (rint (128 / pps));
double const mark_interval = calculate_mark_interval (rint (128 / pps));
- int y = _y * _timeline.
track_height
() + 32;
+ int y = _y * _timeline.
pixels_per_track
() + 32;
wxGraphicsPath path = gc->CreatePath ();
path.MoveToPoint (0, y);
wxGraphicsPath path = gc->CreatePath ();
path.MoveToPoint (0, y);