X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43af39c8630f8278bf9db78547d43304a4b4d5f4..cfa3d7ba83b57ac7a9fa6b79ae73ef9cebcb55f4:/src/common/fontpickercmn.cpp

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 00c68a699d..3ca7872f1d 100644
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -58,7 +58,9 @@ bool wxFontPickerCtrl::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
-    if (!wxPickerBase::CreateBase(parent, id, Font2String(initial),
+    if (!wxPickerBase::CreateBase(parent, id,
+                                  Font2String(initial.IsOk() ? initial
+                                                             : *wxNORMAL_FONT),
                                   pos, size, style, validator, name))
         return false;