If no colour name then use "BLACK"

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-07-21 22:53:43 +00:00
parent f4d233c74a
commit 448971f395

View File

@@ -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);