X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/clipbrd.h?ds=sidebyside diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h index 886ac3871c..3adcf06d01 100644 --- a/include/wx/clipbrd.h +++ b/include/wx/clipbrd.h @@ -17,11 +17,11 @@ #if wxUSE_CLIPBOARD -#include "wx/object.h" +#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; // ---------------------------------------------------------------------------- @@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxClipboard; // with wxDataObject. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxClipboardBase : public wxObject +class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject { public: wxClipboardBase() { m_usePrimary = false; } @@ -59,6 +59,9 @@ public: // ask if data in correct format is available virtual bool IsSupported( const wxDataFormat& format ) = 0; + // ask if data in correct format is available + virtual bool IsSupportedAsync( wxEvtHandler *sink ); + // fill data with data on the clipboard (if available) virtual bool GetData( wxDataObject& data ) = 0; @@ -94,6 +97,48 @@ public: bool m_usePrimary; }; +// ---------------------------------------------------------------------------- +// asynchronous clipboard event +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent +{ +public: + 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); + } + + +protected: + wxVector m_formats; + + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent) +}; + +wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent ); + +typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&); + +#define wxClipboardEventHandler(func) \ + wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func) + +#define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func)) + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -115,10 +160,8 @@ public: #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/mac/clipbrd.h" + #include "wx/osx/clipbrd.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/clipbrd.h" #elif defined(__WXPM__) @@ -129,10 +172,10 @@ public: // helpful class for opening the clipboard and automatically closing it // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxClipboardLocker +class WXDLLIMPEXP_CORE wxClipboardLocker { public: - wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL) + wxClipboardLocker(wxClipboard *clipboard = NULL) { m_clipboard = clipboard ? clipboard : wxTheClipboard; if ( m_clipboard ) @@ -154,7 +197,7 @@ public: private: wxClipboard *m_clipboard; - DECLARE_NO_COPY_CLASS(wxClipboardLocker) + wxDECLARE_NO_COPY_CLASS(wxClipboardLocker); }; #endif // wxUSE_CLIPBOARD