Remove wxST_ELLIPSIZE_END from job status.

This appears to stop multi-line text fields working on OS X,
which caused #615.

diff --git a/ChangeLog b/ChangeLog
index 6ec63e8a0bcdc17343b15d5f410326c016582bce..23bf7b2b2e4ce18706a0eb5aad649ab536bbfd00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2015-06-21  Carl Hetherington  <cth@carlh.net>
+
+       * Fix status message appearance on OS X (#615).
+
 2015-06-19  Carl Hetherington  <cth@carlh.net>
 
        * Fix non-working audio analysis dialogue.
-       
+
        * Version 2.1.6 released.
 
 2015-06-18  Carl Hetherington  <cth@carlh.net>
@@ -1249,7 +1253,7 @@
 
 2014-04-07  Carl Hetherington  <cth@carlh.net>
 
-       * Updated fr_FR translation from Thierry Journet. 
+       * Updated fr_FR translation from Thierry Journet.
 
 2014-04-02  Carl Hetherington  <cth@carlh.net>
 
@@ -2302,4 +2306,3 @@
 2013-08-28  Carl Hetherington  <cth@carlh.net>
 
        * Initial DCP-o-matic release.
-

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 24cacf6b01ec88bd43b91745416e035220b3f6b0..729dbc3adbfcfd528befcc6635cb50f759cd81e9 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -51,7 +51,7 @@ public:
                /* This seems to be required to allow the gauge to shrink under OS X */
                _gauge->SetMinSize (wxSize (0, -1));
                gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
-               _message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+               _message = new wxStaticText (panel, wxID_ANY, wxT (" \n "));
                gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
                table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
                ++n;