X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Frgba_colour_picker.h;h=30c81b103b107dc78d039ac1a24a0562b4ff20c5;hb=23aa3071850761144798112a5aaea61304de8586;hp=e4e58760fc8aff4d8fa11babe89b06b18e0ba1f9;hpb=cef07676fb15c9f1c3c3073d22f06ffe95d9c2ce;p=dcpomatic.git diff --git a/src/wx/rgba_colour_picker.h b/src/wx/rgba_colour_picker.h index e4e58760f..30c81b103 100644 --- a/src/wx/rgba_colour_picker.h +++ b/src/wx/rgba_colour_picker.h @@ -1,24 +1,28 @@ /* Copyright (C) 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 . */ #include "lib/rgba.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS class wxColourPickerCtrl; class wxSlider; @@ -29,6 +33,7 @@ public: RGBAColourPicker (wxWindow* parent, RGBA colour); RGBA colour () const; + void set (RGBA colour); private: wxColourPickerCtrl* _picker;