Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/xrc/xh_fontpicker.cpp b/src/xrc/xh_fontpicker.cpp
index a1bf36d7aa9f9f096b88f1ecee81271f3c08606b..7d767404793a9a00b223db02ced45536aba43d23 100644 (file)
--- a/src/xrc/xh_fontpicker.cpp
+++ b/src/xrc/xh_fontpicker.cpp
@@ -3,7 +3,6 @@
 // Purpose:     XML resource handler for wxFontPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // Purpose:     XML resource handler for wxFontPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -36,14 +35,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());