Disable warnings around all wx includes.

[dcpomatic.git] / src / wx / normal_job_view.cc

diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 22b3e1cc7e9ec07bc448eded42d82d15ad3f6d23..9d29efd578a8f313e28412e3b7e030dc7d624002 100644 (file)
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,33 +18,42 @@
 
 */
 
+
+#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 = 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 ()
 {
@@ -57,6 +66,7 @@ NormalJobView::pause_clicked ()
        }
 }
 
+
 void
 NormalJobView::finished ()
 {