Disable warnings around all wx includes.

[dcpomatic.git] / src / wx / screens_panel.h

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index a00e5d39f28e2f1483bcf297db0397bb0b84a0c7..f19aef68000ac08b34526945ee1851c18fe7f9c8 100644 (file)
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -21,13 +21,14 @@
 
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
+#include <set>
 
 
 namespace dcpomatic {
@@ -36,7 +37,7 @@ namespace dcpomatic {
 
 
 class Cinema;
-class UCollator;
+struct UCollator;
 
 
 class ScreensPanel : public wxPanel
@@ -52,7 +53,7 @@ public:
 
 private:
        void add_cinemas ();
-       boost::optional<wxTreeListItem> add_cinema (std::shared_ptr<Cinema>);
+       boost::optional<wxTreeListItem> add_cinema (std::shared_ptr<Cinema>, wxTreeListItem previous);
        boost::optional<wxTreeListItem> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
        void add_cinema_clicked ();
        void edit_cinema_clicked ();
@@ -64,10 +65,12 @@ private:
        void selection_changed ();
        void search_changed ();
        void checkbox_changed (wxTreeListEvent& ev);
-       boost::optional<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> cinema_for_operation () const;
-
-       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<Cinema>>> Cinemas;
-       typedef std::vector<std::pair<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>>> Screens;
+       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 ();
 
        std::shared_ptr<Cinema> item_to_cinema (wxTreeListItem item) const;
        std::shared_ptr<dcpomatic::Screen> item_to_screen (wxTreeListItem item) const;
@@ -82,30 +85,27 @@ private:
        wxButton* _add_screen;
        wxButton* _edit_screen;
        wxButton* _remove_screen;
-
-       Cinemas _cinemas;
-       Screens _screens;
-       Cinemas _selected_cinemas;
-       Screens _selected_screens;
+       wxButton* _check_all;
+       wxButton* _uncheck_all;
+
+       /* We want to be able to search (and so remove selected things from the view)
+        * but not deselect them, so we maintain lists of selected cinemas and screens.
+        */
+       std::vector<std::shared_ptr<Cinema>> _selected_cinemas;
+       std::vector<std::shared_ptr<dcpomatic::Screen>> _selected_screens;
+       /* Likewise with checked screens, except that we can work out which cinemas
+        * are checked from which screens are checked, so we don't need to store the
+        * cinemas.
+        */
+       std::set<std::shared_ptr<dcpomatic::Screen>> _checked_screens;
 
        std::map<wxTreeListItem, std::shared_ptr<Cinema>> _item_to_cinema;
        std::map<wxTreeListItem, std::shared_ptr<dcpomatic::Screen>> _item_to_screen;
        std::map<std::shared_ptr<Cinema>, wxTreeListItem> _cinema_to_item;
        std::map<std::shared_ptr<dcpomatic::Screen>, wxTreeListItem> _screen_to_item;
 
-       bool _ignore_selection_change;
-
-       class Comparator : public wxTreeListItemComparator
-       {
-       public:
-               Comparator ();
-               ~Comparator ();
-
-               int Compare (wxTreeListCtrl* tree_list, unsigned, wxTreeListItem a, wxTreeListItem b) override;
-
-       private:
-               UCollator* _collator;
-       };
+       bool _ignore_selection_change = false;
+       bool _ignore_check_change = false;
 
-       Comparator _comparator;
+       UCollator* _collator = nullptr;
 };