Remove wxHeaderColumn::SetAsSortKey() and only use SetSortOrder().

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index f42ee1cc92b52d6d913bd500744b15bf36f58d47..06dd74d1947912232d96abbfff82b1463868ab7a 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -17,12 +17,11 @@
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 
 

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

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

+#include "wx/dataobj.h"     // for wxDataFormat

 #include "wx/vector.h"
 
 #include "wx/vector.h"
 

-class WXDLLIMPEXP_FWD_CORE wxDataFormat;
-class WXDLLIMPEXP_FWD_CORE wxDataObject;

 class WXDLLIMPEXP_FWD_CORE wxClipboard;
 
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxClipboard;
 
 // ----------------------------------------------------------------------------


@@ -60,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 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;
 


@@ -102,33 +104,38 @@ public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:

-    wxClipboardEvent(wxEventType commandType = wxEVT_NULL)
-        : wxEvent(0,commandType)
-        { }
+    wxClipboardEvent(wxEventType evtType = wxEVT_NULL)
+        : wxEvent(0, evtType)
+    {
+    }

 
     wxClipboardEvent(const wxClipboardEvent& event)
         : wxEvent(event),
           m_formats(event.m_formats)
 
     wxClipboardEvent(const wxClipboardEvent& event)
         : wxEvent(event),
           m_formats(event.m_formats)

-        { }
+    {
+    }

 
 

-    bool SupportsFormat( const wxDataFormat &format ) const;
-    void AddFormat( const wxDataFormat &format );
+    bool SupportsFormat(const wxDataFormat& format) const;
+    void AddFormat(const wxDataFormat& format);
+
+    virtual wxEvent *Clone() const
+    {
+        return new wxClipboardEvent(*this);
+    }

 
 

-    virtual wxEvent *Clone() const { return new wxClipboardEvent(*this); }

 
 protected:
     wxVector<wxDataFormat> m_formats;
 
 
 protected:
     wxVector<wxDataFormat> m_formats;
 

-private:

     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardEvent)
 };
 

-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_CLIPBOARD_CHANGED;
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_CLIPBOARD_CHANGED, wxClipboardEvent );

 
 typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 
 #define wxClipboardEventHandler(func) \
 
 typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 
 #define wxClipboardEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxClipboardEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxClipboardEventFunction, func)

 
 #define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
 
 
 #define EVT_CLIPBOARD_CHANGED(func) wx__DECLARE_EVT0(wxEVT_CLIPBOARD_CHANGED, wxClipboardEventHandler(func))
 


@@ -170,7 +177,7 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
 class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:
 class WXDLLIMPEXP_CORE wxClipboardLocker
 {
 public:

-    wxClipboardLocker(wxClipboard *clipboard = (wxClipboard *)NULL)
+    wxClipboardLocker(wxClipboard *clipboard = NULL)

     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )
     {
         m_clipboard = clipboard ? clipboard : wxTheClipboard;
         if ( m_clipboard )


@@ -192,7 +199,7 @@ public:
 private:
     wxClipboard *m_clipboard;
 
 private:
     wxClipboard *m_clipboard;
 

-    DECLARE_NO_COPY_CLASS(wxClipboardLocker)
+    wxDECLARE_NO_COPY_CLASS(wxClipboardLocker);

 };
 
 #endif // wxUSE_CLIPBOARD
 };
 
 #endif // wxUSE_CLIPBOARD