projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Un-check screens when they or their cinema are deleted.
[dcpomatic.git]
/
src
/
wx
/
config_dialog.h
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index 3e71cb11ad75c75345c8e7553cc9a1a6691d3376..ce2686864838e8a21f9dec1ce0a1c683e131f82b 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-33,7
+33,6
@@
#include "lib/filter.h"
#include "lib/log.h"
#include "lib/ratio.h"
#include "lib/filter.h"
#include "lib/log.h"
#include "lib/ratio.h"
-#include "lib/util.h"
#include <dcp/certificate_chain.h>
#include <dcp/exceptions.h>
#include <dcp/locale_convert.h>
#include <dcp/certificate_chain.h>
#include <dcp/exceptions.h>
#include <dcp/locale_convert.h>
@@
-49,6
+48,7
@@
LIBDCP_ENABLE_WARNINGS
class AudioMappingView;
class AudioMappingView;
+class CheckBox;
class Page : public wxPreferencesPage
class Page : public wxPreferencesPage
@@
-88,7
+88,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("general"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("general"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-104,10
+104,10
@@
private:
void check_for_updates_changed ();
void check_for_test_updates_changed ();
void check_for_updates_changed ();
void check_for_test_updates_changed ();
-
wx
CheckBox* _set_language;
+ CheckBox* _set_language;
wxChoice* _language;
wxChoice* _language;
-
wx
CheckBox* _check_for_updates;
-
wx
CheckBox* _check_for_test_updates;
+ CheckBox* _check_for_updates;
+ CheckBox* _check_for_test_updates;
};
};
@@
-166,7
+166,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("keys"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("keys"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-197,7
+197,7
@@
public:
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
#ifdef DCPOMATIC_OSX
wxBitmap GetLargeIcon () const override
{
- return wxBitmap(
bitmap
_path("sound"), wxBITMAP_TYPE_PNG);
+ return wxBitmap(
icon
_path("sound"), wxBITMAP_TYPE_PNG);
}
#endif
}
#endif
@@
-212,7
+212,7
@@
private:
void map_changed (AudioMapping m);
void reset_to_default ();
void map_changed (AudioMapping m);
void reset_to_default ();
-
wx
CheckBox* _sound;
+ CheckBox* _sound;
wxChoice* _sound_output;
wxStaticText* _sound_output_details;
AudioMappingView* _map;
wxChoice* _sound_output;
wxStaticText* _sound_output_details;
AudioMappingView* _map;