diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index 1f3f5f056d..ac74a695a4 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -258,8 +258,11 @@ void wxGenericFontDialog::CreateWidgets() styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle())); weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight())); wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour())); - colourChoice->SetStringSelection(name); - + if (name.length()) + colourChoice->SetStringSelection(name); + else + colourChoice->SetStringSelection(wxT("BLACK")); + underLineCheckBox->SetValue(dialogFont.GetUnderlined()); pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);