Implemented the same simple API for creating customized

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

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 9007e15ad852ce58976fcc8df2e01d8e33175e6d..7349262a5361905b7002d7c77c0d5664fec9d238 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -28,8 +28,12 @@
 
 #include "wx/clrpicker.h"
 
 
 #include "wx/clrpicker.h"
 

-#include "wx/textctrl.h"
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif

 
 

+const wxChar wxColourPickerCtrlNameStr[] = wxT("colourpicker");
+const wxChar wxColourPickerWidgetNameStr[] = wxT("colourpickerwidget");

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -57,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...
 
     // 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));
                                         GetPickerStyle(style));

+
+    // complete sizer creation
+    wxPickerBase::PostCreation();
+

     m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
             wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
             NULL, this);
     m_picker->Connect(wxEVT_COMMAND_COLOURPICKER_CHANGED,
             wxColourPickerEventHandler(wxColourPickerCtrl::OnColourChange),
             NULL, this);