X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fnormal_job_view.cc;h=9d29efd578a8f313e28412e3b7e030dc7d624002;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=2ae6a014034ef7d274ef1fe9270666e911914a15;hpb=36492186c9a968e861ac4fea9ea056b81ae40f9a;p=dcpomatic.git

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 2ae6a0140..9d29efd57 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 "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_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->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&NormalJobView::pause_clicked, this));
+	_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 ()
 {