X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Frecipients_panel.h;h=6e1f1408ffb6603dd5b821501f5918d1e4bd8dc3;hb=7e6fa2a2d848f81d82d6ae5151b5ef851b4b720a;hp=d224eed1b98251c71c2ae9c8f668ae73118fbcad;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index d224eed1b..6e1f1408f 100644
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,23 @@
 
 */
 
+
+#include "lib/collator.h"
 #include "lib/dkdm_recipient.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
 
+
 class DKDMRecipient;
 
+
 class RecipientsPanel : public wxPanel
 {
 public:
@@ -39,7 +43,7 @@ public:
 
 	void setup_sensitivity ();
 
-	std::list<std::shared_ptr<DKDMRecipient> > recipients () const;
+	std::list<std::shared_ptr<DKDMRecipient>> recipients () const;
 	boost::signals2::signal<void ()> RecipientsChanged;
 
 private:
@@ -59,9 +63,11 @@ private:
 	wxButton* _remove_recipient;
 	wxTreeItemId _root;
 
-	typedef std::map<wxTreeItemId, std::shared_ptr<DKDMRecipient> > RecipientMap;
+	typedef std::map<wxTreeItemId, std::shared_ptr<DKDMRecipient>> RecipientMap;
 	RecipientMap _recipients;
 	RecipientMap _selected;
 
 	bool _ignore_selection_change;
+
+	Collator _collator;
 };