diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-27 14:36:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-27 14:36:18 +0000 |
| commit | ec93ea976a7eb9fbc542d5264cc4cfdefb42b49f (patch) | |
| tree | b3221d9c65acf6004d5e75c7bf61fac01edc050b | |
| parent | 8f091c9a58a7e8388e9a09e32520a0fce8f6d8fc (diff) | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/wx/colour_conversion_editor.cc | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -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 c24cc689e..36ca074fa 100644 --- 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; |