X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=eade690437e2b19456b8631ee7bd575f6ba8d593;hb=fb6e245fa03e5720b8f8fdea3e2228536b22d5cf;hp=b7f3a269f9ac442e1cbe887cf30234da24c18daf;hpb=f258388fd0a521f3d58a91e78c4460784f6700f3;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index b7f3a269f..eade69043 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -18,43 +18,47 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONFIG_DIALOG_H
 #define DCPOMATIC_CONFIG_DIALOG_H
 
-#include "wx_util.h"
+
 #include "editable_list.h"
 #include "make_chain_dialog.h"
+#include "wx_util.h"
 #include "lib/config.h"
-#include "lib/ratio.h"
-#include "lib/filter.h"
+#include "lib/cross.h"
 #include "lib/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
 #include "lib/log.h"
+#include "lib/ratio.h"
 #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>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
 DCPOMATIC_DISABLE_WARNINGS
-#include <wx/stdpaths.h>
+#include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
 #include <RtAudio.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <iostream>
 
+
 class AudioMappingView;
 
+
 class Page : public wxPreferencesPage
 {
 public:
 	Page (wxSize panel_size, int border);
 	virtual ~Page () {}
 
-	wxWindow* CreateWindow (wxWindow* parent);
+	wxWindow* CreateWindow (wxWindow* parent) override;
 
 protected:
 	wxWindow* create_window (wxWindow* parent);
@@ -74,15 +78,16 @@ private:
 	bool _window_exists;
 };
 
+
 class GeneralPage : public Page
 {
 public:
 	GeneralPage (wxSize panel_size, int border);
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
 	}
@@ -91,7 +96,7 @@ public:
 protected:
 	void add_language_controls (wxGridBagSizer* table, int& r);
 	void add_update_controls (wxGridBagSizer* table, int& r);
-	virtual void config_changed ();
+	void config_changed () override;
 
 private:
 	void setup_sensitivity ();
@@ -106,6 +111,7 @@ private:
 	wxCheckBox* _check_for_test_updates;
 };
 
+
 class CertificateChainEditor : public wxDialog
 {
 public:
@@ -156,10 +162,10 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
 	}
@@ -167,10 +173,10 @@ public:
 
 private:
 
-	void setup ();
+	void setup () override;
 
 	void export_decryption_certificate ();
-	void config_changed () {}
+	void config_changed () override {}
 	bool nag_alter_decryption_chain ();
 	void decryption_advanced ();
 	void signing_advanced ();
@@ -187,10 +193,10 @@ public:
 		: Page (panel_size, border)
 	{}
 
-	wxString GetName() const;
+	wxString GetName() const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
+	wxBitmap GetLargeIcon () const override
 	{
 		return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
 	}
@@ -198,8 +204,8 @@ public:
 
 private:
 
-	void setup ();
-	void config_changed ();
+	void setup () override;
+	void config_changed () override;
         boost::optional<std::string> get_sound_output ();
 	void sound_changed ();
 	void sound_output_changed ();
@@ -214,20 +220,21 @@ private:
 	Button* _reset_to_default;
 };
 
+
 class LocationsPage : public Page
 {
 public:
 	LocationsPage (wxSize panel_size, int border);
 
-	wxString GetName () const;
+	wxString GetName () const override;
 
 #ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const;
+	wxBitmap GetLargeIcon () const override;
 #endif
 
 private:
-	void setup ();
-	void config_changed ();
+	void setup () override;
+	void config_changed () override;
 	void content_directory_changed ();
 	void playlist_directory_changed ();
 	void kdm_directory_changed ();
@@ -236,4 +243,5 @@ private:
 	wxDirPickerCtrl* _playlist_directory;
 	wxDirPickerCtrl* _kdm_directory;
 };
+
 #endif