X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.h;h=aa9832e5db14453accce3c2ae88fa17587d261e8;hb=ca0becb1dd13b47a8f1b7976dedc44466c49d0a7;hp=7087e9641b62cd7073792cfa97441ff89b0fabd8;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h index 7087e9641..aa9832e5d 100644 --- a/src/wx/timeline_content_view.h +++ b/src/wx/timeline_content_view.h @@ -23,13 +23,13 @@ #define DCPOMATIC_TIMELINE_CONTENT_VIEW_H +#include "timeline_view.h" #include "lib/change_signaller.h" #include "lib/types.h" -#include "lib/warnings.h" -#include "timeline_view.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include class Content; @@ -64,7 +64,6 @@ protected: private: void do_paint (wxGraphicsContext* gc, std::list> overlaps) override; - int y_pos (int t) const; void content_change (ChangeType type, int p); boost::optional _track;