Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/common/clrpickercmn.cpp b/src/common/clrpickercmn.cpp
index 6b7ea1c7687d1d218ba1cb216609d5c571b8c3c9..510488dd116b28c68c54cfa8e47f59399d25dca5 100644 (file)
--- a/src/common/clrpickercmn.cpp
+++ b/src/common/clrpickercmn.cpp
@@ -32,12 +32,14 @@
     #include "wx/textctrl.h"
 #endif
 
     #include "wx/textctrl.h"
 #endif
 

+const char wxColourPickerCtrlNameStr[] = "colourpicker";
+const char wxColourPickerWidgetNameStr[] = "colourpickerwidget";

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

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED)
+wxDEFINE_EVENT(wxEVT_COMMAND_COLOURPICKER_CHANGED, wxColourPickerEvent);

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


@@ -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...
 
     // 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);


@@ -77,7 +84,7 @@ void wxColourPickerCtrl::SetColour(const wxColour &col)
 bool wxColourPickerCtrl::SetColour(const wxString &text)
 {
     wxColour col(text);     // smart wxString->wxColour conversion
 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();
         return false;
     M_PICKER->SetColour(col);
     UpdateTextCtrlFromPicker();


@@ -98,7 +105,7 @@ void wxColourPickerCtrl::UpdatePickerFromTextCtrl()
 
     // wxString -> wxColour conversion
     wxColour col(m_text->GetValue());
 
     // wxString -> wxColour conversion
     wxColour col(m_text->GetValue());

-    if ( !col.Ok() )
+    if ( !col.IsOk() )

         return;     // invalid user input
 
     if (M_PICKER->GetColour() != col)
         return;     // invalid user input
 
     if (M_PICKER->GetColour() != col)