Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / common / clrpickercmn.cpp

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 5f208643e56fbebcae8a961fce8332f76300f6e2..510488dd116b28c68c54cfa8e47f59399d25dca5 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -24,17 +24,22 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_COLOURPICKERCTRL
+
 #include "wx/clrpicker.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
 
+const char wxColourPickerCtrlNameStr[] = "colourpicker";
+const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_COLOURPICKERCTRL
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
+wxDEFINE_EVENT(wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent);
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
 
@@ -56,8 +61,13 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
 
     // we are not interested to the ID of our picker as we connect
     // to its "changed" event dynamically...
-    m_picker = new wxColourPickerWidget(this, wxID_ANY, col, wxPoint(40,0), wxSize(30,-1),
+    m_picker = new wxColourPickerWidget(this, wxID_ANY, col,
+                                        wxDefaultPosition, wxDefaultSize,
                                         GetPickerStyle(style));
+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+
     m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
             wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
             NULL, this);
@@ -74,7 +84,7 @@ void wxColourPickerCtrl::SetColour(const wxColour &col)
 bool wxColourPickerCtrl::SetColour(const wxString &text)
 {
     wxColour col(text);     // smart wxString->wxColour conversion
-    if ( !col.Ok() )
+    if ( !col.IsOk() )
         return false;
     M_PICKER->SetColour(col);
     UpdateTextCtrlFromPicker();
@@ -95,7 +105,7 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
 
     // wxString -> wxColour conversion
     wxColour col(m_text->GetValue());
-    if ( !col.Ok() )
+    if ( !col.IsOk() )
         return;     // invalid user input
 
     if (M_PICKER->GetColour() != col)