X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fnormal_job_view.cc;h=016fb225559b3d56175f011995f388252616e600;hb=2f518094d7db4e8586eba9c741289735794c572c;hp=9bfa332c965b2bb90ba6afe7c88c17d7a1b683c6;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 9bfa332c9..016fb2255 100644
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,45 +18,55 @@
 
 */
 
+
+#include "dcpomatic_button.h"
 #include "normal_job_view.h"
 #include "lib/job.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::shared_ptr;
 
-using boost::shared_ptr;
 
 NormalJobView::NormalJobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: JobView (job, parent, container, table)
-	, _pause (0)
 {
 
 }
 
+
 void
 NormalJobView::finish_setup (wxWindow* parent, wxSizer* sizer)
 {
-	_pause = new wxButton (parent, wxID_ANY, _("Pause"));
+	_pause = new Button (parent, _("Pause"));
 	_pause->Bind (wxEVT_BUTTON, boost::bind (&NormalJobView::pause_clicked, this));
 	sizer->Add (_pause, 1, wxALIGN_CENTER_VERTICAL);
 }
 
 int
+
 NormalJobView::insert_position () const
 {
 	return 0;
 }
 
+
 void
 NormalJobView::pause_clicked ()
 {
-	if (_job->paused()) {
+	if (_job->paused_by_user()) {
 		_job->resume ();
 		_pause->SetLabel (_("Pause"));
 	} else {
-		_job->pause ();
+		_job->pause_by_user ();
 		_pause->SetLabel (_("Resume"));
 	}
 }
 
+
 void
 NormalJobView::finished ()
 {