projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wxWidgets assertion on opening the video filters selector.
[dcpomatic.git]
/
src
/
wx
/
screens_panel.h
diff --git
a/src/wx/screens_panel.h
b/src/wx/screens_panel.h
index 9c9811c1d0de7fa83d224896216b514410a7364c..a91fbc0e055e41a49aa5c6e98dd753f4593e0083 100644
(file)
--- a/
src/wx/screens_panel.h
+++ b/
src/wx/screens_panel.h
@@
-19,12
+19,13
@@
*/
*/
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include "lib/config.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/srchctrl.h>
#include <wx/treelist.h>
#include <wx/srchctrl.h>
#include <wx/treelist.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <list>
#include <map>
#include <boost/signals2.hpp>
#include <list>
#include <map>
@@
-37,7
+38,7
@@
namespace dcpomatic {
class Cinema;
class Cinema;
-
class
UCollator;
+
struct
UCollator;
class ScreensPanel : public wxPanel
class ScreensPanel : public wxPanel
@@
-71,6
+72,9
@@
private:
int compare (std::string const& utf8_a, std::string const& utf8_b);
void check_all ();
void uncheck_all ();
int compare (std::string const& utf8_a, std::string const& utf8_b);
void check_all ();
void uncheck_all ();
+ bool notify_cinemas_changed();
+ void clear_and_re_add();
+ void config_changed(Config::Property);
std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@
-108,4
+112,7
@@
private:
bool _ignore_check_change = false;
UCollator* _collator = nullptr;
bool _ignore_check_change = false;
UCollator* _collator = nullptr;
+
+ boost::signals2::scoped_connection _config_connection;
+ bool _ignore_cinemas_changed = false;
};
};