Ensure there is valid context for DrawRectangle

[wxWidgets.git] / src / xrc / xh_fontpicker.cpp

diff --git a/src/xrc/xh_fontpicker.cpp b/src/xrc/xh_fontpicker.cpp
index 1470369e64b3ddfaea56a7ae3597226ea540a57a..f0436bbccf79b0fe03e89fff044fe64265889d05 100644 (file)
--- a/src/xrc/xh_fontpicker.cpp
+++ b/src/xrc/xh_fontpicker.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
+// Name:        src/xrc/xh_fontpicker.cpp
+// Purpose:     XML resource handler for wxFontPickerCtrl

 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // RCS-ID:      $Id$


@@ -36,14 +36,14 @@ wxObject *wxFontPickerCtrlXmlHandler::DoCreateResource()
    XRC_MAKE_INSTANCE(picker, wxFontPickerCtrl)
 
     wxFont f = *wxNORMAL_FONT;
    XRC_MAKE_INSTANCE(picker, wxFontPickerCtrl)
 
     wxFont f = *wxNORMAL_FONT;

-    if (HasParam(wxT("default-font")))
-        f = GetFont(wxT("default-font"));
+    if (HasParam(wxT("value")))
+        f = GetFont(wxT("value"));

 
    picker->Create(m_parentAsWindow,
                   GetID(),
                   f,
                   GetPosition(), GetSize(),
 
    picker->Create(m_parentAsWindow,
                   GetID(),
                   f,
                   GetPosition(), GetSize(),

-                  GetStyle(_T("style"), wxFNTP_DEFAULT_STYLE),
+                  GetStyle(wxT("style"), wxFNTP_DEFAULT_STYLE),

                   wxDefaultValidator,
                   GetName());
 
                   wxDefaultValidator,
                   GetName());