C++11 tidying.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 5203af609f8e13673968d50dca03610cdf8496ee..dd0e92152f191b936dc7ccf8d15a73f5645a7cc5 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -32,26 +32,30 @@
 #include "lib/util.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 class AudioMappingView;
 
-class Page
+class Page : public wxPreferencesPage
 {
 public:
        Page (wxSize panel_size, int border);
        virtual ~Page () {}
 
+       wxWindow* CreateWindow (wxWindow* parent);
+
 protected:
        wxWindow* create_window (wxWindow* parent);
 
@@ -70,24 +74,19 @@ private:
        bool _window_exists;
 };
 
-class StockPage : public wxStockPreferencesPage, public Page
+class GeneralPage : public Page
 {
 public:
-       StockPage (Kind kind, wxSize panel_size, int border);
-       wxWindow* CreateWindow (wxWindow* parent);
-};
+       GeneralPage (wxSize panel_size, int border);
 
-class StandardPage : public wxPreferencesPage, public Page
-{
-public:
-       StandardPage (wxSize panel_size, int border);
-       wxWindow* CreateWindow (wxWindow* parent);
-};
+       wxString GetName () const;
 
-class GeneralPage : public StockPage
-{
-public:
-       GeneralPage (wxSize panel_size, int border);
+#ifdef DCPOMATIC_OSX
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif
 
 protected:
        void add_language_controls (wxGridBagSizer* table, int& r);
@@ -114,9 +113,9 @@ public:
                wxWindow* parent,
                wxString title,
                int border,
-               boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
-               boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
-               boost::function<bool (void)> nag_alter
+               std::function<void (std::shared_ptr<dcp::CertificateChain>)> set,
+               std::function<std::shared_ptr<const dcp::CertificateChain> (void)> get,
+               std::function<bool (void)> nag_alter
                );
 
        void add_button (wxWindow* button);
@@ -145,16 +144,16 @@ private:
        wxStaticText* _private_key_bad;
        wxSizer* _sizer;
        wxBoxSizer* _button_sizer;
-       boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
-       boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
-       boost::function<bool (void)> _nag_alter;
+       std::function<void (std::shared_ptr<dcp::CertificateChain>)> _set;
+       std::function<std::shared_ptr<const dcp::CertificateChain> (void)> _get;
+       std::function<bool (void)> _nag_alter;
 };
 
-class KeysPage : public StandardPage
+class KeysPage : public Page
 {
 public:
        KeysPage (wxSize panel_size, int border)
-               : StandardPage (panel_size, border)
+               : Page (panel_size, border)
        {}
 
        wxString GetName () const;
@@ -180,11 +179,11 @@ private:
 };
 
 
-class SoundPage : public StandardPage
+class SoundPage : public Page
 {
 public:
        SoundPage (wxSize panel_size, int border)
-               : StandardPage (panel_size, border)
+               : Page (panel_size, border)
        {}
 
        wxString GetName() const;
@@ -214,7 +213,7 @@ private:
        Button* _reset_to_default;
 };
 
-class LocationsPage : public StandardPage
+class LocationsPage : public Page
 {
 public:
        LocationsPage (wxSize panel_size, int border);
@@ -232,15 +231,8 @@ private:
        void playlist_directory_changed ();
        void kdm_directory_changed ();
 
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       void background_image_changed ();
-#endif
-
        wxDirPickerCtrl* _content_directory;
        wxDirPickerCtrl* _playlist_directory;
        wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       FilePickerCtrl* _background_image;
-#endif
 };
 #endif