clipboard implementation generalized

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/clipbrd.h b/include/wx/mac/clipbrd.h
index a197ffa71e51e6f466c5e0a0a88ea1558670ff4d..62fe3e51c471bccb3cd6173b5ad13cddc7a81466 100644 (file)
--- a/include/wx/mac/clipbrd.h
+++ b/include/wx/mac/clipbrd.h
@@ -25,31 +25,6 @@
 #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();
-#define wxClipboardOpen wxIsClipboardOpened
-WXDLLEXPORT bool wxCloseClipboard();
-
-// get/set data
-WXDLLEXPORT bool wxEmptyClipboard();
-WXDLLEXPORT bool wxSetClipboardData(wxDataFormat dataFormat,
-                                    const void *data,
-                                    int width = 0, int height = 0);
-WXDLLEXPORT 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,
-                                          wxChar *formatName,
-                                          int maxCount);
-
 //-----------------------------------------------------------------------------
 // wxClipboard
 //-----------------------------------------------------------------------------
@@ -96,7 +71,8 @@ public:
     void UsePrimarySelection( bool WXUNUSED(primary) = FALSE ) { }
 
 private:
-    bool m_clearOnExit;
+    wxDataObject     *m_data;
+    bool              m_open;
 };
 
 #endif // wxUSE_CLIPBOARD

diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h
index 366ee6ce3aa382ec30b4d356012f988a779ba77e..aaa535b3fa220d494f0e0b122f99d1924424391c 100644 (file)
--- a/include/wx/mac/metafile.h
+++ b/include/wx/mac/metafile.h
@@ -120,10 +120,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data
 // ----------------------------------------------------------------------------
 
-// TODO: implement OLE side of things. At present, it's just for clipboard
-// use.
-
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DATAOBJ
 class WXDLLEXPORT wxMetafileDataObject : public wxDataObject
 {
 public: