Copy DCP name layout fix from master.

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 5957dc9d0013f409ce0e82d8e7ada60771ffdcdb..18ffb8b3b59e31fea6613bcd8638bfaa85332ecd 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -77,9 +77,15 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
                ++r;
        }
 
-       add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
-       _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
-       grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+       /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see
+          http://trac.wxwidgets.org/ticket/12539
+       */
+       _dcp_name = new wxStaticText (
+               _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize,
+               wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
+               );
+
+       grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
        ++r;
 
        add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
@@ -496,13 +502,7 @@ DCPPanel::edit_isdcf_button_clicked ()
 void
 DCPPanel::setup_dcp_name ()
 {
-       string s = _film->dcp_name (true);
-       if (s.length() > 28) {
-               _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
-               _dcp_name->SetToolTip (std_to_wx (s));
-       } else {
-               _dcp_name->SetLabel (std_to_wx (s));
-       }
+       _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true)));
 }
 
 void