Use libdcp's warnings.h

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

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 1c14ad35ca88553cb6c83fbbb9a89bfbf8c1d1ba..c13ec7ed0c8b678259566326466d87c00f16e3dd 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -55,10 +55,13 @@
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
@@ -89,7 +92,7 @@ public:
        {}
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -146,7 +149,7 @@ private:
                _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
 
@@ -246,20 +249,20 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Defaults");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -385,7 +388,7 @@ private:
                }
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
 
@@ -545,20 +548,20 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Servers");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                _use_any_servers = new CheckBox (_panel, _("Search network for servers"));
                _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
@@ -578,7 +581,7 @@ private:
                _use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                checked_set (_use_any_servers, Config::instance()->use_any_servers ());
                _servers_list->refresh ();
@@ -606,20 +609,20 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("TMS");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                _upload = new CheckBox (_panel, _("Upload DCP to TMS after creation"));
                _panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border);
@@ -659,7 +662,7 @@ private:
                _tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
 
@@ -717,20 +720,20 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Email");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -776,7 +779,7 @@ private:
                _send_test_email->Bind (wxEVT_BUTTON, boost::bind(&EmailPage::send_test_email_clicked, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
 
@@ -889,20 +892,20 @@ public:
 #endif
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("KDM Email");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -948,9 +951,9 @@ private:
                _reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
-               Config* config = Config::instance ();
+               auto config = Config::instance ();
 
                checked_set (_subject, config->kdm_subject ());
                checked_set (_from, config->kdm_from ());
@@ -1011,20 +1014,20 @@ public:
 #endif
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Notifications");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -1100,7 +1103,7 @@ private:
                _reset_email->Enable(s);
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
 
@@ -1184,20 +1187,20 @@ public:
 #endif
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Cover Sheet");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                _cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
                _panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
@@ -1209,7 +1212,7 @@ private:
                _reset_cover_sheet->Bind (wxEVT_BUTTON, boost::bind (&CoverSheetPage::reset_cover_sheet, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                checked_set (_cover_sheet, Config::instance()->cover_sheet());
        }
@@ -1243,20 +1246,20 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Identifiers");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
        }
 #endif
 
 private:
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -1301,7 +1304,7 @@ private:
                _j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();
                checked_set (_issuer, config->dcp_issuer ());
@@ -1361,13 +1364,13 @@ public:
                : Page (panel_size, border)
        {}
 
-       wxString GetName () const
+       wxString GetName () const override
        {
                return _("Advanced");
        }
 
 #ifdef DCPOMATIC_OSX
-       wxBitmap GetLargeIcon () const
+       wxBitmap GetLargeIcon () const override
        {
                return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
        }
@@ -1385,7 +1388,7 @@ private:
                table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
        }
 
-       void setup ()
+       void setup () override
        {
                auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                table->AddGrowableCol (1, 1);
@@ -1545,7 +1548,7 @@ private:
 #endif
        }
 
-       void config_changed ()
+       void config_changed () override
        {
                auto config = Config::instance ();