don't use old name for wxTE_PROCESS_ENTER unavailable when compatibility is off

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

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 5f208643e56fbebcae8a961fce8332f76300f6e2..75295088d8db4670743eca1af90f609c52dcb3cc 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -24,16 +24,19 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_COLOURPICKERCTRL
+

 #include "wx/clrpicker.h"
 
 #include "wx/clrpicker.h"
 

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

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

-#if wxUSE_COLOURPICKERCTRL
-

 DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrl, wxPickerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxEvent)


@@ -58,6 +61,10 @@ bool wxColourPickerCtrl::Create( wxWindow *parent, wxWindowID id,
     // to its "changed" event dynamically...
     m_picker = new wxColourPickerWidget(this, wxID_ANY, col, wxPoint(40,0), wxSize(30,-1),
                                         GetPickerStyle(style));
     // to its "changed" event dynamically...
     m_picker = new wxColourPickerWidget(this, wxID_ANY, col, wxPoint(40,0), wxSize(30,-1),
                                         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);