#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)
IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
// 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);