X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d701f0ebfeca67580e7d5da616a8e573665984a..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/clipbrd.h

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 8432b0f067..fc9a399f3b 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -12,38 +12,30 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "clipbrd.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
-#include "wx/list.h"
-#include "wx/module.h"
-#include "wx/dataobj.h"     // for wxDataFormat
-
 // These functions superceded by wxClipboard, but retained in order to
 // implement wxClipboard, and for compatibility.
 
 // open/close the clipboard
-WXDLLEXPORT bool wxOpenClipboard();
-WXDLLEXPORT bool wxIsClipboardOpened();
+WXDLLIMPEXP_CORE bool wxOpenClipboard();
+WXDLLIMPEXP_CORE bool wxIsClipboardOpened();
 #define wxClipboardOpen wxIsClipboardOpened
-WXDLLEXPORT bool wxCloseClipboard();
+WXDLLIMPEXP_CORE bool wxCloseClipboard();
 
 // get/set data
-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxEmptyClipboard();
+WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,
                                     const void *data,
                                     int width = 0, int height = 0);
-WXDLLEXPORT void* wxGetClipboardData(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,
                                      long *len = NULL);
 
 // clipboard formats
-WXDLLEXPORT bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLEXPORT wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLEXPORT int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
+WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
+WXDLLIMPEXP_CORE int  wxRegisterClipboardFormat(wxChar *formatName);
+WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
                                           wxChar *formatName,
                                           int maxCount);
 
@@ -51,14 +43,11 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat,
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxDataObject;
-class WXDLLEXPORT wxClipboard : public wxClipboardBase
+class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
 {
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-
 public:
     wxClipboard();
-    ~wxClipboard();
+    virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
     virtual bool Open();
@@ -89,14 +78,13 @@ public:
     // eating memory), otherwise the clipboard will be emptied on exit
     virtual bool Flush();
 
-    // X11 has two clipboards which get selected by this call. Empty on MSW.
-    void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
-
 private:
-    bool m_clearOnExit;
+    IDataObject *m_lastDataObject;
     bool m_isOpened;
+
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
 #endif // wxUSE_CLIPBOARD
-#endif
-    // _WX_CLIPBRD_H_
+
+#endif // _WX_CLIPBRD_H_