More enum class additions.

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

diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 048a79253e21ac9fe4be2215ce4b7b54ccc0eadb..1a9c85dde762f9cec226714ea96a3f78156c4897 100644 (file)
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -52,6 +52,7 @@ public:
         *  @param part Part of Content that the property is in (e.g. &Content::video)
         *  @param model_getter Function on the Content to get the value.
         *  @param model_setter Function on the Content to set the value.
+        *  @param view_changed Function called when the view has changed; useful for linking controls.
         *  @param view_to_model Function to convert a view value to a model value.
         *  @param model_to_view Function to convert a model value to a view value.
         */
@@ -59,9 +60,10 @@ 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,
                boost::function<U (V)> view_to_model,
                boost::function<V (U)> model_to_view
                )
@@ -72,6 +74,7 @@ public:
                , _part (part)
                , _model_getter (model_getter)
                , _model_setter (model_setter)
+               , _view_changed (view_changed)
                , _view_to_model (view_to_model)
                , _model_to_view (model_to_view)
                , _ignore_model_changes (false)
@@ -87,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)
@@ -105,17 +108,21 @@ public:
                update_from_model ();
 
                for (typename List::iterator i = _content.begin(); i != _content.end(); ++i) {
+#if BOOST_VERSION >= 106100
+                       _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, boost::placeholders::_1, boost::placeholders::_3)));
+#else
                        _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, _1, _3)));
+#endif
                }
        }
 
        /** Add this widget to a wxGridBagSizer */
-       void add (wxGridBagSizer* sizer, wxGBPosition position, wxGBSpan span = wxDefaultSpan)
+       void add (wxGridBagSizer* sizer, wxGBPosition position, wxGBSpan span = wxDefaultSpan, int flag = 0)
        {
                _sizer = sizer;
                _position = position;
                _span = span;
-               _sizer->Add (_wrapped, _position, _span);
+               _sizer->Add (_wrapped, _position, _span, flag);
        }
 
        /** Update the view from the model */
@@ -146,6 +153,9 @@ public:
                for (size_t i = 0; i < _content.size(); ++i) {
                        boost::bind (_model_setter, _part (_content[i].get()).get(), _view_to_model (wx_get (_wrapped))) ();
                }
+               if (_view_changed) {
+                       _view_changed ();
+               }
                _ignore_model_changes = false;
        }
 
@@ -158,7 +168,7 @@ private:
 
        void set_single ()
        {
-               if (_wrapped->IsShown ()) {
+               if (_wrapped->IsShown() || !_sizer) {
                        return;
                }
 
@@ -171,7 +181,7 @@ private:
 
        void set_multiple ()
        {
-               if (_button->IsShown ()) {
+               if (_button->IsShown() || !_sizer) {
                        return;
                }
 
@@ -185,14 +195,14 @@ private:
        void button_clicked ()
        {
                U const v = boost::bind (_model_getter, _part(_content.front().get()).get())();
-               for (typename List::iterator i = _content.begin (); i != _content.end(); ++i) {
-                       boost::bind (_model_setter, _part(i->get()).get(), v) ();
+               for (auto const& i: _content) {
+                       boost::bind (_model_setter, _part(i.get()).get(), v)();
                }
        }
 
        void model_changed (ChangeType type, int property)
        {
-               if (type == CHANGE_TYPE_DONE && property == _property && !_ignore_model_changes) {
+               if (type == ChangeType::DONE && property == _property && !_ignore_model_changes) {
                        update_from_model ();
                }
        }
@@ -204,9 +214,10 @@ 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;
        boost::function<U (V)> _view_to_model;
        boost::function<V (U)> _model_to_view;
        std::list<boost::signals2::connection> _connections;
@@ -227,9 +238,10 @@ 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 (S*, int)> setter,
+               boost::function<void ()> view_changed = boost::function<void ()>()
                )
                : ContentWidget<S, wxSpinCtrl, int, int> (
                        parent,
@@ -237,6 +249,7 @@ public:
                        property,
                        part,
                        getter, setter,
+                       view_changed,
                        &caster<int, int>,
                        &caster<int, int>
                        )
@@ -253,9 +266,10 @@ 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 (S*, double)> setter,
+               boost::function<void ()> view_changed = boost::function<void ()>()
                )
                : ContentWidget<S, wxSpinCtrlDouble, double, double> (
                        parent,
@@ -263,6 +277,7 @@ public:
                        property,
                        part,
                        getter, setter,
+                       view_changed,
                        &caster<double, double>,
                        &caster<double, double>
                        )
@@ -279,11 +294,12 @@ 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,
-               boost::function<int (U)> model_to_view
+               boost::function<int (U)> model_to_view,
+               boost::function<void ()> view_changed = boost::function<void()>()
                )
                : ContentWidget<S, wxChoice, U, int> (
                        parent,
@@ -292,6 +308,7 @@ public:
                        part,
                        getter,
                        setter,
+                       view_changed,
                        view_to_model,
                        model_to_view
                        )