Fix (I think) some strange situations where ::get() on dialogs

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

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 58d0e388511b38169febc63babfc5267522fe851..e82c4f91cdf77b44d9c35eb5bb786f6e3ae00b06 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -18,31 +18,36 @@
 
 */
 
+
 #ifndef DCPOMATIC_EDITABLE_LIST_H
 #define DCPOMATIC_EDITABLE_LIST_H
 
-#include "wx_util.h"
+
 #include "dcpomatic_button.h"
-#include <wx/wx.h>
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
-#include <boost/function.hpp>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
+
 class EditableListColumn
 {
 public:
-       EditableListColumn (std::string name_)
+       EditableListColumn (wxString name_)
                : name (name_)
                , growable (false)
        {}
 
-       EditableListColumn (std::string name_, boost::optional<int> width_, bool growable_)
+       EditableListColumn (wxString name_, boost::optional<int> width_, bool growable_)
                : name (name_)
                , width (width_)
                , growable (growable_)
        {}
 
-       std::string name;
+       wxString name;
        boost::optional<int> width;
        bool growable;
 };
@@ -60,9 +65,9 @@ public:
        EditableList (
                wxWindow* parent,
                std::vector<EditableListColumn> columns,
-               boost::function<std::vector<T> ()> get,
-               boost::function<void (std::vector<T>)> set,
-               boost::function<std::string (T, int)> column,
+               std::function<std::vector<T> ()> get,
+               std::function<void (std::vector<T>)> set,
+               std::function<std::string (T, int)> column,
                bool can_edit = true,
                bool title = true
                )
@@ -78,12 +83,12 @@ public:
                SetSizer (_sizer);
 
                long style = wxLC_REPORT | wxLC_SINGLE_SEL;
-               if (title) {
+               if (!title) {
                        style |= wxLC_NO_HEADER;
                }
 
                int total_width = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        total_width += i.width.get_value_or (_default_width);
                }
 
@@ -101,10 +106,10 @@ public:
 #endif
 
                int j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        wxListItem ip;
                        ip.SetId (j);
-                       ip.SetText (std_to_wx(i.name));
+                       ip.SetText (i.name);
                        _list->InsertColumn (j, ip);
                        ++j;
                }
@@ -118,13 +123,13 @@ public:
                {
                        wxSizer* s = new wxBoxSizer (wxVERTICAL);
                        _add = new Button (this, _("Add..."));
-                       s->Add (_add, 0, wxTOP | wxBOTTOM, 2);
+                       s->Add (_add, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        if (can_edit) {
                                _edit = new Button (this, _("Edit..."));
-                               s->Add (_edit, 0, wxTOP | wxBOTTOM, 2);
+                               s->Add (_edit, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        }
                        _remove = new Button (this, _("Remove"));
-                       s->Add (_remove, 0, wxTOP | wxBOTTOM, 2);
+                       s->Add (_remove, 1, wxEXPAND | wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
                        _sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
                }
 
@@ -205,7 +210,8 @@ private:
                S* dialog = new S (this);
 
                if (dialog->ShowModal() == wxID_OK) {
-                       boost::optional<T> const v = dialog->get ();
+                       auto const v = dialog->get ();
+                       static_assert(std::is_same<typename std::remove_const<decltype(v)>::type, boost::optional<T>>::value, "get() must return boost::optional<T>");
                        if (v) {
                                add_to_control (v.get ());
                                std::vector<T> all = _get ();
@@ -230,7 +236,8 @@ private:
                S* dialog = new S (this);
                dialog->set (all[item]);
                if (dialog->ShowModal() == wxID_OK) {
-                       boost::optional<T> const v = dialog->get ();
+                       auto const v = dialog->get ();
+                       static_assert(std::is_same<typename std::remove_const<decltype(v)>::type, boost::optional<T>>::value, "get() must return boost::optional<T>");
                        if (!v) {
                                return;
                        }
@@ -268,7 +275,7 @@ private:
                int fixed_width = 0;
                int growable = 0;
                int j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        fixed_width += i.width.get_value_or (_default_width);
                        if (!i.growable) {
                                _list->SetColumnWidth (j, i.width.get_value_or(_default_width));
@@ -279,7 +286,7 @@ private:
                }
 
                j = 0;
-               BOOST_FOREACH (EditableListColumn i, _columns) {
+               for (auto i: _columns) {
                        if (i.growable) {
                                _list->SetColumnWidth (j, i.width.get_value_or(_default_width) + (w - fixed_width) / growable);
                        }
@@ -289,10 +296,10 @@ private:
                ev.Skip ();
        }
 
-       boost::function <std::vector<T> ()> _get;
-       boost::function <void (std::vector<T>)> _set;
+       std::function <std::vector<T> ()> _get;
+       std::function <void (std::vector<T>)> _set;
        std::vector<EditableListColumn> _columns;
-       boost::function<std::string (T, int)> _column;
+       std::function<std::string (T, int)> _column;
 
        wxButton* _add;
        wxButton* _edit;