part of the fix to the initial colour selection in the font picker dialog (the real fix was the change to wxColourToRGB() in msw/private.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,13 @@ int wxFontDialog::ShowModal()
|
||||
wxFillLogFont(&logFont, &m_fontData.initialFont);
|
||||
}
|
||||
|
||||
chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
|
||||
if ( m_fontData.fontColour.Ok() )
|
||||
{
|
||||
chooseFontStruct.rgbColors = wxColourToRGB(m_fontData.fontColour);
|
||||
|
||||
// need this for the colour to be taken into account
|
||||
flags |= CF_EFFECTS;
|
||||
}
|
||||
|
||||
// CF_ANSIONLY flag is obsolete for Win32
|
||||
if ( !m_fontData.GetAllowSymbols() )
|
||||
|
Reference in New Issue
Block a user