Ensure we don't modify a shared object in wxOSX wxRegion::DoOffset().

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

diff --git a/src/xrc/xh_clrpicker.cpp b/src/xrc/xh_clrpicker.cpp
index 2d71b823bb556e689c23cf52e6bfd509840a15af..5c458697b0b03f0a95ef5a04004d282db3c270e0 100644 (file)
--- a/src/xrc/xh_clrpicker.cpp
+++ b/src/xrc/xh_clrpicker.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_clrpicker.cpp
+// Name:        src/xrc/xh_clrpicker.cpp

 // Purpose:     XML resource handler for wxColourPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17
 // Purpose:     XML resource handler for wxColourPickerCtrl
 // Author:      Francesco Montorsi
 // Created:     2006-04-17


@@ -36,9 +36,9 @@ wxObject *wxColourPickerCtrlXmlHandler::DoCreateResource()
 
    picker->Create(m_parentAsWindow,
                   GetID(),
 
    picker->Create(m_parentAsWindow,
                   GetID(),

-                  GetColour(wxT("colour")),
+                  GetColour(wxT("value"), *wxBLACK),

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

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

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