Use wxString for EditableListColumn.

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

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index 31e6ebe79d0612ff4fedf2b776468b188a0e9a62..ecb7d8107752b1cb385975471a68c887e1561164 100644 (file)
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -31,6 +31,9 @@ using std::back_inserter;
 using std::list;
 using std::cout;
 using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string
 column (string s)
@@ -68,7 +71,7 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
        copy (emails.begin(), emails.end(), back_inserter (_emails));
 
        vector<EditableListColumn> columns;
-       columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
+       columns.push_back (EditableListColumn(_("Address")));
        _email_list = new EditableList<string, EmailDialog> (
                this, columns, bind (&CinemaDialog::get_emails, this), bind (&CinemaDialog::set_emails, this, _1), bind (&column, _1)
                );
@@ -96,6 +99,8 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
 
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
+
+       _name->SetFocus ();
 }
 
 string