change generic ints to enums in wxDC (closes #9959)

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

diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h
index 3998ca027dd4ff50fc7d3e2c431c7be01ac9f04e..19212882775bd94c77256fe6e969766b345886c6 100644 (file)
--- a/include/wx/gtk/clrpicker.h
+++ b/include/wx/gtk/clrpicker.h
@@ -12,16 +12,14 @@
 #ifndef _WX_GTK_CLRPICKER_H_
 #define _WX_GTK_CLRPICKER_H_
 
 #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 +36,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,6 +45,8 @@ public:     // overrides
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxColourPickerWidgetNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxColourPickerWidgetNameStr);
 

+    virtual ~wxColourButton();
+

 protected:
     void UpdateColour();
 
 protected:
     void UpdateColour();