X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreens_panel.h;h=7703d69aad1cec27e1ebf90ec5a6fc6272d02036;hp=0095937b71d48269bdf79179e2a54e689a532cc0;hb=f984990795e548e2c4160d17d0fa54a40c8b1311;hpb=c55877926307d7018942beb5fd65a39f278e05de

diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 0095937b7..7703d69aa 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -1,58 +1,87 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 #include <list>
 #include <map>
 
+namespace dcpomatic {
+	class Screen;
+}
+
+
 class Cinema;
-class Screen;
+
+
+/** Shim around wxTreeCtrl so we can use strcoll() to compare things */
+class TreeCtrl : public wxTreeCtrl
+{
+public:
+	wxDECLARE_DYNAMIC_CLASS (TreeCtrl);
+
+	TreeCtrl () {}
+
+	TreeCtrl (wxWindow* parent)
+		: wxTreeCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT)
+	{}
+
+	virtual ~TreeCtrl () {}
+
+private:
+	int OnCompareItems (wxTreeItemId const& a, wxTreeItemId const& b);
+};
+
 
 class ScreensPanel : public wxPanel
 {
 public:
-	ScreensPanel (wxWindow* parent);
+	explicit ScreensPanel (wxWindow* parent);
 	~ScreensPanel ();
 
-	std::list<boost::shared_ptr<Screen> > screens () const;
+	std::list<std::shared_ptr<dcpomatic::Screen>> screens () const;
 	void setup_sensitivity ();
 
 	boost::signals2::signal<void ()> ScreensChanged;
 
 private:
 	void add_cinemas ();
-	void add_cinema (boost::shared_ptr<Cinema>);
-	void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
+	boost::optional<wxTreeItemId> add_cinema (std::shared_ptr<Cinema>);
+	boost::optional<wxTreeItemId> add_screen (std::shared_ptr<Cinema>, std::shared_ptr<dcpomatic::Screen>);
 	void add_cinema_clicked ();
 	void edit_cinema_clicked ();
 	void remove_cinema_clicked ();
 	void add_screen_clicked ();
 	void edit_screen_clicked ();
 	void remove_screen_clicked ();
-	void selection_changed (wxTreeEvent &);
+	void selection_changed_shim (wxTreeEvent &);
+	void selection_changed ();
 	void search_changed ();
 
 	wxSearchCtrl* _search;
-	wxTreeCtrl* _targets;
+	TreeCtrl* _targets;
 	wxButton* _add_cinema;
 	wxButton* _edit_cinema;
 	wxButton* _remove_cinema;
@@ -61,8 +90,8 @@ private:
 	wxButton* _remove_screen;
 	wxTreeItemId _root;
 
-	typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
-	typedef std::map<wxTreeItemId, boost::shared_ptr<Screen> > ScreenMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<Cinema>> CinemaMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<dcpomatic::Screen>> ScreenMap;
 
 	CinemaMap _cinemas;
 	ScreenMap _screens;