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

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 8be3545e6d5c11d30a6626c296582a8be60577b2..ba05073f6bfa0641b4a4873aa9a383a3c1a4fb3e 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -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);