X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8946ede10c2702c7acbb194fe8bd2793d7fb8358..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/clipbrd.h diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index b00b6bdd4a..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,27 +104,38 @@ 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 { return new wxClipboardEvent(*this); } + virtual wxEvent *Clone() const + { + return new wxClipboardEvent(*this); + } + protected: wxVector m_formats; -private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent) }; -extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CLIPBOARD_CHANGED; +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ); typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); #define wxClipboardEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxClipboardEventFunction, &func) + wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func) #define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func)) @@ -150,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__) @@ -167,7 +175,7 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); class WXDLLIMPEXP_CORE wxClipboardLocker { public: - wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL) + wxClipboardLocker(wxClipboard *clipboard = NULL) { m_clipboard = clipboard ? clipboard : wxTheClipboard; if ( m_clipboard ) @@ -189,7 +197,7 @@ public: private: wxClipboard *m_clipboard; - DECLARE_NO_COPY_CLASS(wxClipboardLocker) + wxDECLARE_NO_COPY_CLASS(wxClipboardLocker); }; #endif // wxUSE_CLIPBOARD