X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Frgba_colour_picker.cc;h=731cf95396181cc9ef72814ee56f9533c903b3e5;hb=45364e583d8fa318b1a1a580c6a9421937ba7fde;hp=041c78de996ff1cb6ff136f51e65e2788142f5dc;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/rgba_colour_picker.cc b/src/wx/rgba_colour_picker.cc
index 041c78de9..731cf9539 100644
--- a/src/wx/rgba_colour_picker.cc
+++ b/src/wx/rgba_colour_picker.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,7 +20,11 @@
 
 #include "rgba_colour_picker.h"
 #include "wx_util.h"
+#include "static_text.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/clrpicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
 	: wxPanel (parent, wxID_ANY)
@@ -30,10 +34,10 @@ RGBAColourPicker::RGBAColourPicker (wxWindow* parent, RGBA colour)
 	_picker = new wxColourPickerCtrl (this, wxID_ANY);
 	_picker->SetColour (wxColour (colour.r, colour.g, colour.b));
 	sizer->Add (_picker, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
-	sizer->Add (new wxStaticText (this, wxID_ANY, _("Alpha   0")), 0, wxALIGN_CENTRE_VERTICAL);
+	sizer->Add (new StaticText (this, _("Alpha   0")), 0, wxALIGN_CENTRE_VERTICAL);
 	_alpha = new wxSlider (this, wxID_ANY, colour.a, 0, 255);
 	sizer->Add (_alpha, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP);
-	sizer->Add (new wxStaticText (this, wxID_ANY, _("255")), 0, wxALIGN_CENTRE_VERTICAL);
+	sizer->Add (new StaticText (this, _("255")), 0, wxALIGN_CENTRE_VERTICAL);
 
 	SetSizer (sizer);
 }
@@ -44,3 +48,10 @@ RGBAColourPicker::colour () const
 	wxColour const c = _picker->GetColour ();
 	return RGBA (c.Red(), c.Green(), c.Blue(), _alpha->GetValue());
 }
+
+void
+RGBAColourPicker::set (RGBA colour)
+{
+	_picker->SetColour (wxColour (colour.r, colour.g, colour.b));
+	_alpha->SetValue (colour.a);
+}