X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c757b5fee093bbc3686f1e474316396b742fb888..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/clrpicker.h diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index 1742257d00..e2d52184e6 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -20,7 +20,7 @@ #include "wx/pickerbase.h" -class WXDLLIMPEXP_CORE wxColourPickerEvent; +class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[]; @@ -69,7 +69,8 @@ protected: // fact that all classes being mapped as wxColourPickerWidget have the // same prototype for their contructor (and also explains why we use // define instead of a typedef) -#if defined(__WXGTK24__) // since GTK > 2.4, there is GtkColorButton +// since GTK > 2.4, there is GtkColorButton +#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/clrpicker.h" #define wxColourPickerWidget wxColourButton #else @@ -170,10 +171,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) }; // ---------------------------------------------------------------------------- @@ -188,13 +193,6 @@ typedef void (wxEvtHandler::*wxColourPickerEventFunction)(wxColourPickerEvent&); #define EVT_COLOURPICKER_CHANGED(id, fn) \ wx__DECLARE_EVT1(wxEVT_COMMAND_COLOURPICKER_CHANGED, id, wxColourPickerEventHandler(fn)) -#ifdef _WX_DEFINE_DATE_EVENTS_ - DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLOURPICKER_CHANGED) - - IMPLEMENT_DYNAMIC_CLASS(wxColourPickerEvent, wxCommandEvent) -#endif - - #endif // wxUSE_COLOURPICKERCTRL