No real changes, just make wxWindow::CanScroll() virtual.

[wxWidgets.git] / include / wx / gtk / clrpicker.h

diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index 1ddbfe3b1818fb5e41879d067c75f26a7e1bb5a1..4a375fb849331d2af9b019bcde95604fe44991fc 100644 (file)
--- a/include/wx/gtk/clrpicker.h
+++ b/include/wx/gtk/clrpicker.h
@@ -5,13 +5,14 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
-// RCS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_CLRPICKER_H_
 #define _WX_GTK_CLRPICKER_H_
 
+#include "wx/button.h"
+
 //-----------------------------------------------------------------------------
 // wxColourButton
 //-----------------------------------------------------------------------------
@@ -50,8 +51,8 @@ protected:
 
 public:     // used by the GTK callback only
 
-    void SetGdkColor(const GdkColor& gdkColor)
-        { m_colour = wxColor(gdkColor); }
+    void GTKSetColour(const wxColour& colour)
+        { m_colour = colour; }
 
     wxWindow *m_topParent;