projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 ce5df2c5b84b43badb59a4fbcee7cd77c8c3729f..eade690437e2b19456b8631ee7bd575f6ba8d593 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-18,36
+18,40
@@
*/
*/
+
#ifndef DCPOMATIC_CONFIG_DIALOG_H
#define DCPOMATIC_CONFIG_DIALOG_H
#ifndef DCPOMATIC_CONFIG_DIALOG_H
#define DCPOMATIC_CONFIG_DIALOG_H
-#include "wx_util.h"
+
#include "editable_list.h"
#include "make_chain_dialog.h"
#include "editable_list.h"
#include "make_chain_dialog.h"
+#include "wx_util.h"
#include "lib/config.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/dcp_content_type.h"
+#include "lib/exceptions.h"
+#include "lib/filter.h"
#include "lib/log.h"
#include "lib/log.h"
+#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/util.h"
-#include "lib/cross.h"
-#include "lib/exceptions.h"
#include "lib/warnings.h"
#include "lib/warnings.h"
-#include <dcp/locale_convert.h>
-#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
#include <dcp/certificate_chain.h>
+#include <dcp/exceptions.h>
+#include <dcp/locale_convert.h>
DCPOMATIC_DISABLE_WARNINGS
DCPOMATIC_DISABLE_WARNINGS
-#include <wx/
stdpaths
.h>
+#include <wx/
filepicker
.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/stdpaths.h>
#include <RtAudio.h>
#include <RtAudio.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <iostream>
+
class AudioMappingView;
class AudioMappingView;
+
class Page : public wxPreferencesPage
{
public:
class Page : public wxPreferencesPage
{
public:
@@
-74,6
+78,7
@@
private:
bool _window_exists;
};
bool _window_exists;
};
+
class GeneralPage : public Page
{
public:
class GeneralPage : public Page
{
public:
@@
-106,6
+111,7
@@
private:
wxCheckBox* _check_for_test_updates;
};
wxCheckBox* _check_for_test_updates;
};
+
class CertificateChainEditor : public wxDialog
{
public:
class CertificateChainEditor : public wxDialog
{
public:
@@
-214,6
+220,7
@@
private:
Button* _reset_to_default;
};
Button* _reset_to_default;
};
+
class LocationsPage : public Page
{
public:
class LocationsPage : public Page
{
public:
@@
-236,4
+243,5
@@
private:
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
};
wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
};
+
#endif
#endif