Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 3c018f328125a32c56b67f01d7bae64f1d0a786c..3adcf06d01cf78c594b24b4a669417d06b7c8772 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -19,10 +19,9 @@
 
 #include "wx/event.h"
 #include "wx/chartype.h"
 
 #include "wx/event.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;
 
 // ----------------------------------------------------------------------------


@@ -105,18 +104,29 @@ public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:
 class WXDLLIMPEXP_CORE wxClipboardEvent : public wxEvent
 {
 public:

-    wxClipboardEvent(wxEventType evtType = wxEVT_NULL);
-    wxClipboardEvent(const wxClipboardEvent& event);
+    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);
 
 
     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)
 };
 


@@ -150,8 +160,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
     #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"
     #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
     #include "wx/x11/clipbrd.h"

-#elif defined(__WXMGL__)
-    #include "wx/mgl/clipbrd.h"

 #elif defined(__WXMAC__)
     #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)


@@ -189,7 +197,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