X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fnormal_job_view.cc;h=ada0596c82b978a5b5a15af19c5c621727e0e697;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hp=d02ad1fd296f2e54ace55d5b57f944608217d6ef;hpb=4697fe9aef6f4c51d394691a178d5417028690bd;p=dcpomatic.git diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc index d02ad1fd2..ada0596c8 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 + Copyright (C) 2012-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -19,6 +19,7 @@ */ #include "normal_job_view.h" +#include "dcpomatic_button.h" #include "lib/job.h" #include @@ -32,10 +33,10 @@ NormalJobView::NormalJobView (shared_ptr job, wxWindow* parent, wxWindow* c } void -NormalJobView::add_buttons (wxWindow* parent, wxSizer* sizer) +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); } @@ -48,11 +49,11 @@ NormalJobView::insert_position () const 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")); } }