Fix strange job status layout on OS X.

diff --git a/ChangeLog b/ChangeLog
index 29daf40547be3384b21561883c7bf223a4655d29..b511d1d10f893aeb309eacd2b08b7cac2501c623 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-10-07  Carl Hetherington  <cth@carlh.net>
+
+       * Fix job description layout on OS X.
+
 2015-10-06  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.4.4 released.

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 05dff36c504fbf0a7c910d419964cebf6e723e4b..1b809edeccec09c6adbc78c953141647b8b98708 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -48,14 +48,14 @@ public:
        {
                int n = 0;
 
-               wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL);
+               _gauge_message = new wxBoxSizer (wxVERTICAL);
                _gauge = new wxGauge (panel, wxID_ANY, 100);
                /* 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);
+               _gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
                _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);
+               _gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
                ++n;
 
                _cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
@@ -100,6 +100,7 @@ private:
                whole += _job->status ();
                if (whole != _last_message) {
                        _message->SetLabelMarkup (std_to_wx (whole));
+                       _gauge_message->Layout ();
                        _last_message = whole;
                }
                if (_job->progress ()) {
@@ -148,6 +149,7 @@ private:
        boost::shared_ptr<Job> _job;
        wxScrolledWindow* _window;
        wxPanel* _panel;
+       wxBoxSizer* _gauge_message;
        wxGauge* _gauge;
        wxStaticText* _message;
        wxButton* _cancel;