fix PCH-less build after changing timer id type to WPARAM (closes #10901)

[wxWidgets.git] / include / wx / clipbrd.h

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 738343ac4da772844499de8f46d0bf67da9af646..3376472381886c8563c580895232f4fc345e2296 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -17,8 +17,9 @@
 #if wxUSE_CLIPBOARD
 
 
-#include "wx/object.h"
+#include "wx/event.h"
 #include "wx/chartype.h"
+#include "wx/vector.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 class WXDLLIMPEXP_FWD_CORE wxDataObject;
@@ -59,6 +60,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 +98,36 @@ public:
     bool m_usePrimary;
 };
 
+// ----------------------------------------------------------------------------
+// asynchronous clipboard event
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
+{
+public:
+    wxClipboardEvent(wxEventType evtType = wxEVT_NULL);
+    wxClipboardEvent(const wxClipboardEvent& event);
+
+    bool SupportsFormat(const wxDataFormat& format) const;
+    void AddFormat(const wxDataFormat& format);
+
+    virtual wxEvent *Clone() const;
+
+protected:
+    wxVector<wxDataFormat> 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
 // ----------------------------------------------------------------------------
@@ -132,7 +166,7 @@ public:
 class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:
-    wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
+    wxClipboardLocker(wxClipboard *clipboard = NULL)
     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )
@@ -154,7 +188,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
-    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);
 };
 
 #endif // wxUSE_CLIPBOARD