fix wxSystemSettings::GetColour() for wxGTK3

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

diff --git a/src/xrc/xh_filepicker.cpp b/src/xrc/xh_filepicker.cpp
index c9d6a5c4029d42b45b28a090aea4a87ec1dcd02e..21d8e51d56acd08343b08b1a787a643ec98526ae 100644 (file)
--- a/src/xrc/xh_filepicker.cpp
+++ b/src/xrc/xh_filepicker.cpp
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
+// Name:        src/xrc/xh_filepicker.cpp
+// Purpose:     XML resource handler for wxFilePickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -29,7 +28,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 +40,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());