X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/clipbrd.h diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 76371170c3..3376472381 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -111,16 +111,15 @@ public: bool SupportsFormat(const wxDataFormat& format) const; void AddFormat(const wxDataFormat& format); - virtual wxEvent *Clone() const { return new wxClipboardEvent(*this); } + virtual wxEvent *Clone() const; protected: wxVector m_formats; -private: DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent) }; -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ) +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ); typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); @@ -167,7 +166,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 +188,7 @@ public: private: wxClipboard *m_clipboard; - DECLARE_NO_COPY_CLASS(wxClipboardLocker) + wxDECLARE_NO_COPY_CLASS(wxClipboardLocker); }; #endif // wxUSE_CLIPBOARD