X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c668531784567b84a131875707d9a63a5977fd77..c5bb5453498db88fa0f13ef7ff5e944b220c2fec:/include/wx/gtk/clrpicker.h diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h index 3998ca027d..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,6 +45,8 @@ public: // overrides const wxValidator& validator = wxDefaultValidator, const wxString& name = wxColourPickerWidgetNameStr); + virtual ~wxColourButton(); + protected: void UpdateColour();