Don't assume any particular default size for XRC image lists.

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

diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp
index cf4fa8ba8e19e383e2c6b5d01510b93c0376c368..df544fa0f58476fa657d64617a351999ddf95172 100644 (file)
--- a/src/xrc/xh_filepicker.cpp
+++ b/src/xrc/xh_filepicker.cpp
@@ -30,6 +30,7 @@ wxFilePickerCtrlXmlHandler::wxFilePickerCtrlXmlHandler() : wxXmlResourceHandler(
     XRC_ADD_STYLE(wxFLP_FILE_MUST_EXIST);
     XRC_ADD_STYLE(wxFLP_CHANGE_DIR);
     XRC_ADD_STYLE(wxFLP_DEFAULT_STYLE);
+    XRC_ADD_STYLE(wxFLP_USE_TEXTCTRL);
     AddWindowStyles();
 }
 
@@ -40,10 +41,10 @@ wxObject *wxFilePickerCtrlXmlHandler::DoCreateResource()
     picker->Create(m_parentAsWindow,
                   GetID(),
                   GetParamValue(wxT("value")),
-                  GetParamValue(wxT("message")),
+                  GetText(wxT("message")),
                   GetParamValue(wxT("wildcard")),
                   GetPosition(), GetSize(),
-                  GetStyle(_T("style"), wxFLP_DEFAULT_STYLE),
+                  GetStyle(wxT("style"), wxFLP_DEFAULT_STYLE),
                   wxDefaultValidator,
                   GetName());