Updating with Vadim's API changes.

[wxWidgets.git] / src / gtk / clrpicker.cpp

diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index f331fe779448c5030029548a8b87f107bf2e18ff..a8ed5ef927734835a2a8544a3b834ce197dd2c34 100644 (file)
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -17,20 +17,16 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gtk/private.h"
+#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__)
+
 #include "wx/clrpicker.h"
 
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-
-
 // ============================================================================
 // implementation
 // ============================================================================
 
-#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__)
-
 //-----------------------------------------------------------------------------
 // "color-set"
 //-----------------------------------------------------------------------------
@@ -41,7 +37,9 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 {
     // update the m_colour member of the wxColourButton
     wxASSERT(p);
-    gtk_color_button_get_color(widget, p->GetGdkColor());
+    GdkColor gdkColor;
+    gtk_color_button_get_color(widget, &gdkColor);
+    p->SetGdkColor(gdkColor);
 
     // fire the colour-changed event
     wxColourPickerEvent event(p, p->GetId(), p->GetColour());
@@ -64,6 +62,7 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
     if (!gtk_check_version(2,4,0))
     {
         m_needParent = true;
+        m_acceptsFocus = true;
 
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style, validator, name))
@@ -84,7 +83,7 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericColourButton::Create(parent, id, col, pos, size,