From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sat, 29 May 2010 10:01:35 +0000 (+0000)
Subject: Fixed assert when editing wxFontProperty with unspecified value (fixes #12086)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/47450ed1372eba027ed58bd8b5af57e017320f12?ds=inline

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 8be3545e6d..ba05073f6b 100644
--- 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);