summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/wx/colour_conversion_editor.cc6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 65849f8e4..4b5394301 100644
--- 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 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;