X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/556151f5ff1bd2fa44de2237a3ad03694c2e3883..dc6588e771dc7180a69841a1b5ec29b4e5ea73d0:/include/wx/clrpicker.h diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index e36b8cca94..d3a2b509d3 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -17,7 +17,6 @@ #if wxUSE_COLOURPICKERCTRL -#include "wx/control.h" #include "wx/pickerbase.h" @@ -137,11 +136,10 @@ public: // internal functions // event handler for our picker void OnColourChange(wxColourPickerEvent &); +protected: virtual long GetPickerStyle(long style) const { return (style & wxCLRP_SHOW_LABEL); } -protected: - // true if the next UpdateTextCtrl() call is to ignore bool m_bIgnoreNextTextCtrlUpdate; @@ -172,10 +170,14 @@ public: wxColour GetColour() const { return m_colour; } void SetColour(const wxColour &c) { m_colour = c; } + + // default copy ctor, assignment operator and dtor are ok + virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); } + private: wxColour m_colour; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxColourPickerEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxColourPickerEvent) }; // ----------------------------------------------------------------------------