Applied colspan corrections, #15274 and #15275 (dghart)

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

diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp
index 3178c07ac43f37ea53d407fd8192d488e31de0b3..90965a34ca087e7270e6bee4711447caad2a9535 100644 (file)
--- a/src/xrc/xh_filepicker.cpp
+++ b/src/xrc/xh_filepicker.cpp
@@ -29,7 +29,9 @@ wxFilePickerCtrlXmlHandler::wxFilePickerCtrlXmlHandler() : wxXmlResourceHandler(
     XRC_ADD_STYLE(wxFLP_OVERWRITE_PROMPT);
     XRC_ADD_STYLE(wxFLP_FILE_MUST_EXIST);
     XRC_ADD_STYLE(wxFLP_CHANGE_DIR);
+    XRC_ADD_STYLE(wxFLP_SMALL);
     XRC_ADD_STYLE(wxFLP_DEFAULT_STYLE);
+    XRC_ADD_STYLE(wxFLP_USE_TEXTCTRL);
     AddWindowStyles();
 }
 
@@ -39,11 +41,11 @@ wxObject *wxFilePickerCtrlXmlHandler::DoCreateResource()
 
     picker->Create(m_parentAsWindow,
                   GetID(),
-                  GetParamValue(wxT("default-path")),
-                  GetParamValue(wxT("message")),
+                  GetParamValue(wxT("value")),
+                  GetText(wxT("message")),
                   GetParamValue(wxT("wildcard")),
                   GetPosition(), GetSize(),
-                  GetStyle(_T("style"), wxFLP_DEFAULT_STYLE),
+                  GetStyle(wxT("style"), wxFLP_DEFAULT_STYLE),
                   wxDefaultValidator,
                   GetName());