more compilation and linking fixes for !wxHAS_NATIVE_TAB_TRAVERSAL after recent changes

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

diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index b88a8a37aa9659866698b302e0588c91e2fdae88..a710f9fa336f7f8df99f13cbbd4a856d3e81b4d9 100644 (file)
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -62,7 +62,6 @@ 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))
@@ -83,7 +82,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,