X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d3166e8acbbc8d351bdc94e507ef5712ffbfd37..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/clipbrd.h?ds=sidebyside diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 3376472381..3adcf06d01 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -19,10 +19,9 @@ #include "wx/event.h" #include "wx/chartype.h" +#include "wx/dataobj.h" // for wxDataFormat #include "wx/vector.h" -class WXDLLIMPEXP_FWD_CORE wxDataFormat; -class WXDLLIMPEXP_FWD_CORE wxDataObject; class WXDLLIMPEXP_FWD_CORE wxClipboard; // ---------------------------------------------------------------------------- @@ -105,13 +104,25 @@ public: class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent { public: - wxClipboardEvent(wxEventType evtType = wxEVT_NULL); - wxClipboardEvent(const wxClipboardEvent& event); + wxClipboardEvent(wxEventType evtType = wxEVT_NULL) + : wxEvent(0, evtType) + { + } + + wxClipboardEvent(const wxClipboardEvent& event) + : wxEvent(event), + m_formats(event.m_formats) + { + } bool SupportsFormat(const wxDataFormat& format) const; void AddFormat(const wxDataFormat& format); - virtual wxEvent *Clone() const; + virtual wxEvent *Clone() const + { + return new wxClipboardEvent(*this); + } + protected: wxVector m_formats; @@ -149,8 +160,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); #include "wx/gtk1/clipbrd.h" #elif defined(__WXX11__) #include "wx/x11/clipbrd.h" -#elif defined(__WXMGL__) - #include "wx/mgl/clipbrd.h" #elif defined(__WXMAC__) #include "wx/osx/clipbrd.h" #elif defined(__WXCOCOA__)