From 47450ed1372eba027ed58bd8b5af57e017320f12 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Sat, 29 May 2010 10:01:35 +0000 Subject: [PATCH] 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 --- src/propgrid/advprops.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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); -- 2.45.2