summaryrefslogtreecommitdiff
path: root/src/wx/screens_panel.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-08-17 17:45:35 +0200
committerCarl Hetherington <cth@carlh.net>2022-10-19 00:27:47 +0200
commite90ff462412902a1e06878a0f34dc2e0323e738c (patch)
tree20aafc1aa9f1c34a7e48eb92efe9027dbf442a34 /src/wx/screens_panel.h
parentce408c272e0f5ae211dd15b7b3bbaf6776a6b899 (diff)
Extract Collator class.
Diffstat (limited to 'src/wx/screens_panel.h')
-rw-r--r--src/wx/screens_panel.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index a91fbc0e0..e9cd8454d 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -19,6 +19,7 @@
*/
+#include "lib/collator.h"
#include "lib/config.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
@@ -38,7 +39,6 @@ namespace dcpomatic {
class Cinema;
-struct UCollator;
class ScreensPanel : public wxPanel
@@ -69,7 +69,6 @@ private:
std::shared_ptr<Cinema> cinema_for_operation () const;
void set_screen_checked (wxTreeListItem item, bool checked);
void setup_cinema_checked_state (wxTreeListItem screen);
- int compare (std::string const& utf8_a, std::string const& utf8_b);
void check_all ();
void uncheck_all ();
bool notify_cinemas_changed();
@@ -111,7 +110,7 @@ private:
bool _ignore_selection_change = false;
bool _ignore_check_change = false;
- UCollator* _collator = nullptr;
+ Collator _collator;
boost::signals2::scoped_connection _config_connection;
bool _ignore_cinemas_changed = false;