fix a couple of typos

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 886ac3871c169aad6987ffabcb7e57a0d1f06571..d3c90df714f18e1472c10e1cb61324923649adc0 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -17,8 +17,9 @@
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 
 

-#include "wx/object.h"
+#include "wx/event.h"

 #include "wx/chartype.h"
 #include "wx/chartype.h"

+#include "wx/vector.h"

 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 class WXDLLIMPEXP_FWD_CORE wxDataObject;
 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 class WXDLLIMPEXP_FWD_CORE wxDataObject;


@@ -32,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxClipboard;
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 
 // with wxDataObject.
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxClipboardBase : public wxObject
+class WXDLLIMPEXP_CORE wxClipboardBase : public wxObject

 {
 public:
     wxClipboardBase() { m_usePrimary = false; }
 {
 public:
     wxClipboardBase() { m_usePrimary = false; }


@@ -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 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;
 
     // fill data with data on the clipboard (if available)
     virtual bool GetData( wxDataObject& data ) = 0;
 


@@ -94,6 +98,43 @@ public:
     bool m_usePrimary;
 };
 
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -118,7 +159,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)


@@ -129,7 +170,7 @@ public:
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 
 // helpful class for opening the clipboard and automatically closing it
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxClipboardLocker
+class WXDLLIMPEXP_CORE wxClipboardLocker

 {
 public:
     wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
 {
 public:
     wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)