From b1387d5e333ec56bfd39c9e1cd92279ca244688d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 20 Jun 2016 19:28:03 +0100 Subject: [PATCH] Fix missing code to display italic / bold font names. --- ChangeLog | 3 +++ src/wx/fonts_dialog.cc | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4aea87d5..414b189d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-06-20 Carl Hetherington + * Fix display of italic and bold font names in the fonts + dialogue. + * Updated pt_BR translation from Max M. Fuhlendorf. * Fix various strange crashes with encoding servers. diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc index 9c0329914..5c89372df 100644 --- a/src/wx/fonts_dialog.cc +++ b/src/wx/fonts_dialog.cc @@ -110,8 +110,10 @@ FontsDialog::setup () item.SetId (n); _fonts->InsertItem (item); _fonts->SetItem (n, 0, std_to_wx (i->id ())); - if (i->file(FontFiles::NORMAL)) { - _fonts->SetItem (n, 1, i->file(FontFiles::NORMAL).get().leaf().string ()); + for (int j = 0; j < FontFiles::VARIANTS; ++j) { + if (i->file(static_cast(j))) { + _fonts->SetItem (n, j + 1, i->file(static_cast(j)).get().leaf().string ()); + } } ++n; } -- 2.30.2