Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If no colour name then use "BLACK"

Browse Source 
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
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/generic/fontdlgg.cpp
View File

@@ -258,7 +258,10 @@ void wxGenericFontDialog::CreateWidgets()
styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle())); styleChoice->SetStringSelection(wxFontStyleIntToString(dialogFont.GetStyle()));
weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight())); weightChoice->SetStringSelection(wxFontWeightIntToString(dialogFont.GetWeight()));
wxString name(wxTheColourDatabase->FindName(m_fontData.GetColour())); 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()); underLineCheckBox->SetValue(dialogFont.GetUnderlined());
pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1); pointSizeChoice->SetSelection(dialogFont.GetPointSize()-1);