Fix build with Sun CC under Linux.

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 122bbf7227c8d35281009bb5662c17d4123b3884..06dd74d1947912232d96abbfff82b1463868ab7a 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -17,12 +17,12 @@
 #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 WXDLLEXPORT wxDataFormat;
-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard;
+class WXDLLIMPEXP_FWD_CORE wxClipboard;
 
 // ----------------------------------------------------------------------------
 // wxClipboard represents the system clipboard. Normally, you should use
@@ -32,7 +32,7 @@ class WXDLLEXPORT 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<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
 // ----------------------------------------------------------------------------
@@ -118,7 +163,7 @@ public:
 #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 +174,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 +199,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
-    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);
 };
 
 #endif // wxUSE_CLIPBOARD