Merge master.

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

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 98e7d0bfd64509ba503db48cba2a8db9113bb6bf..20d180f20149633ce96dabd8b2b9c501216e8378 100644 (file)
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -28,7 +28,8 @@ public:
                std::vector<std::string> columns,
                boost::function<std::vector<T> ()> get,
                boost::function<void (std::vector<T>)> set,
-               boost::function<std::string (T, int)> column
+               boost::function<std::string (T, int)> column,
+               int height = 100
                )
                : wxPanel (parent)
                , _get (get)
@@ -43,7 +44,7 @@ public:
                table->AddGrowableCol (0, 1);
                s->Add (table, 1, wxALL | wxEXPAND, 8);
 
-               _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+               _list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, height), wxLC_REPORT | wxLC_SINGLE_SEL);
 
                for (size_t i = 0; i < columns.size(); ++i) {
                        wxListItem ip;
@@ -138,6 +139,8 @@ private:
                for (int i = 0; i < _columns; ++i) {
                        _list->SetItem (item, i, std_to_wx (_column (all[item], i)));
                }
+
+               _set (all);
        }
 
        void remove_clicked ()