summaryrefslogtreecommitdiff
path: root/src/wx/content_widget.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:16:53 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 22:48:29 +0100
commitdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch)
treee56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/wx/content_widget.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/wx/content_widget.h')
-rw-r--r--src/wx/content_widget.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 6505d08da..d38609cb4 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -60,7 +60,7 @@ public:
wxWindow* parent,
T* wrapped,
int property,
- boost::function<boost::shared_ptr<S> (Content*)> part,
+ boost::function<std::shared_ptr<S> (Content*)> part,
boost::function<U (S*)> model_getter,
boost::function<void (S*, U)> model_setter,
boost::function<void ()> view_changed,
@@ -90,7 +90,7 @@ public:
return _wrapped;
}
- typedef std::vector<boost::shared_ptr<Content> > List;
+ typedef std::vector<std::shared_ptr<Content> > List;
/** Set the content that this control is working on (i.e. the selected content) */
void set_content (List content)
@@ -214,7 +214,7 @@ private:
wxButton* _button;
List _content;
int _property;
- boost::function<boost::shared_ptr<S> (Content *)> _part;
+ boost::function<std::shared_ptr<S> (Content *)> _part;
boost::function<U (S*)> _model_getter;
boost::function<void (S*, U)> _model_setter;
boost::function<void ()> _view_changed;
@@ -238,7 +238,7 @@ public:
wxWindow* parent,
wxSpinCtrl* wrapped,
int property,
- boost::function<boost::shared_ptr<S> (Content *)> part,
+ boost::function<std::shared_ptr<S> (Content *)> part,
boost::function<int (S*)> getter,
boost::function<void (S*, int)> setter,
boost::function<void ()> view_changed = boost::function<void ()>()
@@ -266,7 +266,7 @@ public:
wxWindow* parent,
wxSpinCtrlDouble* wrapped,
int property,
- boost::function<boost::shared_ptr<S> (Content *)> part,
+ boost::function<std::shared_ptr<S> (Content *)> part,
boost::function<double (S*)> getter,
boost::function<void (S*, double)> setter,
boost::function<void ()> view_changed = boost::function<void ()>()
@@ -294,7 +294,7 @@ public:
wxWindow* parent,
wxChoice* wrapped,
int property,
- boost::function<boost::shared_ptr<S> (Content *)> part,
+ boost::function<std::shared_ptr<S> (Content *)> part,
boost::function<U (S*)> getter,
boost::function<void (S*, U)> setter,
boost::function<U (int)> view_to_model,