projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch wx-3.0 -> wx-3.1 on Windows.
[dcpomatic.git]
/
src
/
wx
/
recipients_panel.h
diff --git
a/src/wx/recipients_panel.h
b/src/wx/recipients_panel.h
index 15c043f1aa693f6d5167ac2332dbbf6c362c83e7..aacfccd9a90b96cc2695f3326b85c8a0390f8935 100644
(file)
--- a/
src/wx/recipients_panel.h
+++ b/
src/wx/recipients_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-202
1
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,17
+18,22
@@
*/
*/
+
#include "lib/dkdm_recipient.h"
#include "lib/dkdm_recipient.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/srchctrl.h>
#include <wx/treectrl.h>
#include <wx/wx.h>
#include <wx/srchctrl.h>
#include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <list>
#include <map>
#include <boost/signals2.hpp>
#include <list>
#include <map>
+
class DKDMRecipient;
class DKDMRecipient;
+
class RecipientsPanel : public wxPanel
{
public:
class RecipientsPanel : public wxPanel
{
public:
@@
-37,12
+42,12
@@
public:
void setup_sensitivity ();
void setup_sensitivity ();
- std::list<
boost::shared_ptr<DKDMRecipient>
> recipients () const;
+ std::list<
std::shared_ptr<DKDMRecipient>
> recipients () const;
boost::signals2::signal<void ()> RecipientsChanged;
private:
void add_recipients ();
boost::signals2::signal<void ()> RecipientsChanged;
private:
void add_recipients ();
- void add_recipient (
boost
::shared_ptr<DKDMRecipient>);
+ void add_recipient (
std
::shared_ptr<DKDMRecipient>);
void add_recipient_clicked ();
void edit_recipient_clicked ();
void remove_recipient_clicked ();
void add_recipient_clicked ();
void edit_recipient_clicked ();
void remove_recipient_clicked ();
@@
-57,7
+62,7
@@
private:
wxButton* _remove_recipient;
wxTreeItemId _root;
wxButton* _remove_recipient;
wxTreeItemId _root;
- typedef std::map<wxTreeItemId,
boost::shared_ptr<DKDMRecipient>
> RecipientMap;
+ typedef std::map<wxTreeItemId,
std::shared_ptr<DKDMRecipient>
> RecipientMap;
RecipientMap _recipients;
RecipientMap _selected;
RecipientMap _recipients;
RecipientMap _selected;