X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_reels_view.h;h=c3104565179cf585e022b86cec00891ad872eedf;hb=d7df8d5dd66834e34cd61b425ed80fe21a7ff755;hp=b357be23c1a559316293c867bf9bc7c43ee8097b;hpb=7bc94f069f011a1a7e8554aa5cc88167e409c1f8;p=dcpomatic.git diff --git a/src/wx/timeline_reels_view.h b/src/wx/timeline_reels_view.h index b357be23c..c31045651 100644 --- a/src/wx/timeline_reels_view.h +++ b/src/wx/timeline_reels_view.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2015-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -28,8 +29,7 @@ public: void set_y (int y); private: - void do_paint (wxGraphicsContext* gc); + void do_paint (wxGraphicsContext* gc, std::list > overlaps); -private: int _y; };