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

diff --git a/src/common/fontpickercmn.cpp b/src/common/fontpickercmn.cpp
index 00c68a699d..cc1dd50bbe 100644
--- a/src/common/fontpickercmn.cpp
+++ b/src/common/fontpickercmn.cpp
@@ -39,8 +39,8 @@
 // implementation
 // ============================================================================
 
-const wxChar wxFontPickerCtrlNameStr[] = wxT("fontpicker");
-const wxChar wxFontPickerWidgetNameStr[] = wxT("fontpickerwidget");
+const char wxFontPickerCtrlNameStr[] = "fontpicker";
+const char wxFontPickerWidgetNameStr[] = "fontpickerwidget";
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_FONTPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrl, wxPickerBase)
@@ -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;