Set the font to bold rather than using markup as the former

results in truncated label text on some versions of OS X; ported
from 1.x

diff --git a/ChangeLog b/ChangeLog
index 65849f8e41aeb6a8435fdbb890982500dd28f109..4b539430155c13c1df56a9527ee4c3f2d3cba182 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-27  c.hetherington  <cth@carlh.net>
+
+       * Hopefully fix truncated text in the colour conversion dialog
+       on OS X.
+
 2015-11-26  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.5.9 released.

diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index c24cc689e81d4dfa0549f1a10c889b2cb313954d..36ca074fa0765efae1429ee4b5ddb3e876acd18a 100644 (file)
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -216,8 +216,10 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
 wxStaticText *
 ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const
 {
-       wxStaticText* m = new wxStaticText (parent, wxID_ANY, wxT (""));
-       m->SetLabelMarkup ("<b>" + text + "</b>");
+       wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+       wxFont font (*wxNORMAL_FONT);
+       font.SetWeight (wxFONTWEIGHT_BOLD);
+       m->SetFont (font);
        sizer->Add (m, wxGBPosition (row, 0), wxGBSpan (1, 3), wxALIGN_CENTER_VERTICAL | wxTOP, 12);
        ++row;
        return m;