Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index d9777834f9a113015108841b8ca329063bacdcd7..49c405f9ef9aa09c0d977af6c8d7d458e5d1442b 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -145,6 +145,10 @@ TimingPanel::TimingPanel (ContentPanel* p, FilmViewer* viewer)
 
        t = new wxStaticText (this, wxID_ANY, wxT (""));
        t->SetLabelMarkup (out);
+#ifdef DCPOMATIC_OSX
+       /* Hack to stop hidden text on some versions of OS X */
+       t->SetMinSize (wxSize (-1, 256));
+#endif
        grid->Add (t, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 6);
 
        /* Completely speculative fix for #891 */