Fixed assert when editing wxFontProperty with unspecified value (fixes #12086)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2010-05-29 10:01:35 +00:00
parent 7a165f2dc6
commit 47450ed137

View File

@ -689,7 +689,10 @@ bool wxFontProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* WXUNUSED(prima
wxFontData data;
wxFont font;
font << useValue;
if ( useValue.GetType() == wxS("wxFont") )
font << useValue;
data.SetInitialFont( font );
data.SetColour(*wxBLACK);