X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_widget.h;h=302436e55385f5f0e75eb4844f8b253c5791f168;hb=f23b9491dcd25d02f7966f39dfdbb0ad998aa5ad;hp=34755e4b5a7e1707b710f45487bc9cdf4934dfd3;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 34755e4b5..302436e55 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -18,20 +18,27 @@
 
 */
 
+
 /** @file  src/wx/content_widget.h
  *  @brief ContentWidget class.
  */
 
+
 #ifndef DCPOMATIC_CONTENT_WIDGET_H
 #define DCPOMATIC_CONTENT_WIDGET_H
 
+
 #include "wx_util.h"
 #include "lib/content.h"
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
+
 /** @class ContentWidget
  *  @brief A widget which represents some Content state and which can be used
  *  when multiple pieces of content are selected.
@@ -70,12 +77,12 @@ public:
 		, _sizer (0)
 		, _button (new wxButton (parent, wxID_ANY, _("Multiple values")))
 		, _property (property)
-		, _part (part)
-		, _model_getter (model_getter)
-		, _model_setter (model_setter)
-		, _view_changed (view_changed)
-		, _view_to_model (view_to_model)
-		, _model_to_view (model_to_view)
+		, _part(std::move(part))
+		, _model_getter(std::move(model_getter))
+		, _model_setter(std::move(model_setter))
+		, _view_changed(std::move(view_changed))
+		, _view_to_model(std::move(view_to_model))
+		, _model_to_view(std::move(model_to_view))
 		, _ignore_model_changes (false)
 	{
 		_button->SetToolTip (_("Click the button to set all selected content to the same value."));