Added experimental async clipboard format query

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 738343ac4da772844499de8f46d0bf67da9af646..f42ee1cc92b52d6d913bd500744b15bf36f58d47 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -19,6 +19,7 @@
 
 #include "wx/object.h"
 #include "wx/chartype.h"
+#include "wx/vector.h"
 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 class WXDLLIMPEXP_FWD_CORE wxDataObject;
@@ -94,6 +95,43 @@ public:
     bool m_usePrimary;
 };
 
+// ----------------------------------------------------------------------------
+// asynchronous clipboard event
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
+{
+public:
+    wxClipboardEvent(wxEventType commandType = wxEVT_NULL)
+        : wxEvent(0,commandType)
+        { }
+
+    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<wxDataFormat> m_formats;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
+};
+
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CLIPBOARD_CHANGED;
+
+typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
+
+#define wxClipboardEventHandler(func) \
+    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxClipboardEventFunction, &func)
+
+#define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------

diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 04f26042eb3c1af0f6acdeb98dd4cc675dc890f8..548e911743adbb7fd2ed5375c3403c9743644511 100644 (file)
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -15,6 +15,8 @@
 // wxClipboard
 // ----------------------------------------------------------------------------
 
+#include "wx/weakref.h"
+
 class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
 {
 public:
@@ -46,6 +48,9 @@ public:
     // ask if data in correct format is available
     virtual bool IsSupported( const wxDataFormat& format );
 
+    // 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 );
 
@@ -116,6 +121,11 @@ private:
     bool m_open;
     bool m_formatSupported;
 
+public:
+    // async stuff
+    wxEvtHandlerRef    m_sink;
+private:
+    GtkWidget         *m_targetsWidgetAsync;  // for getting list of supported formats
 
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };

diff --git a/src/common/clipcmn.cpp b/src/common/clipcmn.cpp
index 4b9225b04259b4b5d658d2759deaddb7260af35e..afdd300f30b2b230b5133dcf03ff053b4eb3ea55 100644 (file)
--- a/src/common/clipcmn.cpp
+++ b/src/common/clipcmn.cpp
@@ -32,6 +32,31 @@
     #include "wx/module.h"
 #endif
 
+// ---------------------------------------------------------
+// wxClipboardEvent
+// ---------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxClipboardEvent,wxEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_CLIPBOARD_CHANGED)
+
+bool wxClipboardEvent::SupportsFormat( const wxDataFormat &format ) const
+{ 
+    wxVector<wxDataFormat>::size_type n;
+    for (n = 0; n < m_formats.size(); n++)
+        { if (m_formats[n] == format) return true; }
+    return false;
+}     
+        
+void wxClipboardEvent::AddFormat( const wxDataFormat &format ) 
+{ 
+    m_formats.push_back( format );
+}
+
+// ---------------------------------------------------------
+// wxClipboardBase
+// ---------------------------------------------------------
+
 static wxClipboard *gs_clipboard = NULL;
 
 /*static*/ wxClipboard *wxClipboardBase::Get()