Ensure there is valid context for DrawRectangle

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

diff --git a/src/xrc/xh_dirpicker.cpp b/src/xrc/xh_dirpicker.cpp
index 510094a54d5ab42786faff31d663739e50b7248f..ff750e15d185c434d01430f7a207de1cac3d3723 100644 (file)
--- a/src/xrc/xh_dirpicker.cpp
+++ b/src/xrc/xh_dirpicker.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -27,6 +27,7 @@ wxDirPickerCtrlXmlHandler::wxDirPickerCtrlXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxDIRP_USE_TEXTCTRL);
     XRC_ADD_STYLE(wxDIRP_DIR_MUST_EXIST);
     XRC_ADD_STYLE(wxDIRP_CHANGE_DIR);
     XRC_ADD_STYLE(wxDIRP_USE_TEXTCTRL);
     XRC_ADD_STYLE(wxDIRP_DIR_MUST_EXIST);
     XRC_ADD_STYLE(wxDIRP_CHANGE_DIR);

+    XRC_ADD_STYLE(wxDIRP_SMALL);

     XRC_ADD_STYLE(wxDIRP_DEFAULT_STYLE);
     AddWindowStyles();
 }
     XRC_ADD_STYLE(wxDIRP_DEFAULT_STYLE);
     AddWindowStyles();
 }


@@ -37,10 +38,10 @@ wxObject *wxDirPickerCtrlXmlHandler::DoCreateResource()
 
    picker->Create(m_parentAsWindow,
                   GetID(),
 
    picker->Create(m_parentAsWindow,
                   GetID(),

-                  GetParamValue(wxT("default-path")),
-                  GetParamValue(wxT("message")),
+                  GetParamValue(wxT("value")),
+                  GetText(wxT("message")),

                   GetPosition(), GetSize(),
                   GetPosition(), GetSize(),

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

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