Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index 5a301ad9b6bf012cac563a7e4e601948004ae3b0..4a375fb849331d2af9b019bcde95604fe44991fc 100644 (file)
--- a/include/wx/gtk/clrpicker.h
+++ b/include/wx/gtk/clrpicker.h
@@ -5,23 +5,20 @@
 // Modified by:
 // Created:     14/4/2006
 // Copyright:   (c) Francesco Montorsi
 // 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_
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GTK_CLRPICKER_H_
 #define _WX_GTK_CLRPICKER_H_
 

-// since GtkColorButton is available only for GTK+ >= 2.4,
-// we need to use generic version if we detect (at runtime)
-// that GTK+ < 2.4
-#include "wx/generic/clrpickerg.h"
+#include "wx/button.h"

 
 //-----------------------------------------------------------------------------
 // wxColourButton
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxColourButton
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxColourButton : public wxGenericColourButton
+class WXDLLIMPEXP_CORE wxColourButton : public wxButton,
+                                        public wxColourPickerWidgetBase

 {
 public:
     wxColourButton() : m_topParent(NULL) {}
 {
 public:
     wxColourButton() : m_topParent(NULL) {}


@@ -38,11 +35,6 @@ public:
         Create(parent, id, initial, pos, size, style, validator, name);
     }
 
         Create(parent, id, initial, pos, size, style, validator, name);
     }
 

-    virtual ~wxColourButton();
-
-
-public:     // overrides
-

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxColour& initial = *wxBLACK,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxColour& initial = *wxBLACK,


@@ -52,13 +44,15 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxColourPickerWidgetNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxColourPickerWidgetNameStr);
 

+    virtual ~wxColourButton();
+

 protected:
     void UpdateColour();
 
 public:     // used by the GTK callback only
 
 protected:
     void UpdateColour();
 
 public:     // used by the GTK callback only
 

-    GdkColor *GetGdkColor() const
-        { return m_colour.GetColor(); }
+    void GTKSetColour(const wxColour& colour)
+        { m_colour = colour; }

 
     wxWindow *m_topParent;
 
 
     wxWindow *m_topParent;