X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec376c8fd9ff813392030426acd2317c6fa6527e..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/gtk/clrpicker.h diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h index 5e54c4c298..1921288277 100644 --- 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_ -// 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 //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxColourButton : public wxGenericColourButton +class WXDLLIMPEXP_CORE wxColourButton : public wxButton, + public wxColourPickerWidgetBase { public: wxColourButton() : m_topParent(NULL) {} @@ -38,11 +36,6 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual ~wxColourButton(); - - -public: // overrides - bool Create(wxWindow *parent, wxWindowID id, const wxColour& initial = *wxBLACK, @@ -52,13 +45,15 @@ public: // overrides const wxValidator& validator = wxDefaultValidator, const wxString& name = wxColourPickerWidgetNameStr); - void UpdateColour(); + virtual ~wxColourButton(); +protected: + void UpdateColour(); public: // used by the GTK callback only - GdkColor *GetGdkColor() const - { return m_colour.GetColor(); } + void SetGdkColor(const GdkColor& gdkColor) + { m_colour = wxColor(gdkColor); } wxWindow *m_topParent;