X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fec9cc08e7d94574af3f04b4c5fbafde63ac0b31..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/clrpickercmn.cpp?ds=inline diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp index 6b7ea1c768..7349262a53 100644 --- a/src/common/clrpickercmn.cpp +++ b/src/common/clrpickercmn.cpp @@ -32,6 +32,8 @@ #include "wx/textctrl.h" #endif +const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker"); +const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget"); // ============================================================================ // implementation @@ -59,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);