Cleanup: replace some list with vector.

[dcpomatic.git] / src / wx / cinema_dialog.cc

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 659d334a24717f40d54a899c9ae2262ce80d0c33..84fde5f41acb0985a4ed45d74a7612650e51d7d2 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -28,7 +28,6 @@
 using std::back_inserter;
 using std::copy;
 using std::cout;
-using std::list;
 using std::string;
 using std::vector;
 using boost::bind;
@@ -37,7 +36,7 @@ using namespace boost::placeholders;
 #endif
 
 
-CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<string> emails, string notes, int utc_offset_hour, int utc_offset_minute)
+CinemaDialog::CinemaDialog(wxWindow* parent, wxString title, string name, vector<string> emails, string notes, int utc_offset_hour, int utc_offset_minute)
        : wxDialog (parent, wxID_ANY, title)
 {
        auto overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -67,11 +66,11 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        copy (emails.begin(), emails.end(), back_inserter (_emails));
 
        vector<EditableListColumn> columns;
-       columns.push_back (EditableListColumn(_("Address")));
+       columns.push_back (EditableListColumn(_("Address"), 500, true));
        _email_list = new EditableList<string, EmailDialog> (
-               this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) {
+               this, columns, bind(&CinemaDialog::emails, this), bind (&CinemaDialog::set_emails, this, _1), [](string s, int) {
                        return s;
-               }, true, false
+               }, EditableListTitle::INVISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
                );
 
        sizer->Add (_email_list, wxGBPosition(r, 0), wxGBSpan(1, 2), wxEXPAND);
@@ -117,21 +116,12 @@ CinemaDialog::set_emails (vector<string> e)
 
 
 vector<string>
-CinemaDialog::get_emails () const
+CinemaDialog::emails() const
 {
        return _emails;
 }
 
 
-list<string>
-CinemaDialog::emails () const
-{
-       list<string> e;
-       copy (_emails.begin(), _emails.end(), back_inserter(e));
-       return e;
-}
-
-
 int
 CinemaDialog::utc_offset_hour () const
 {