From 662899dd606f8845fc99453f999104b90c19c8bb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 7 Jun 2001 20:57:31 +0000 Subject: [PATCH] clipboard implementation generalized git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/clipbrd.h | 28 ++-------------------------- include/wx/mac/metafile.h | 5 +---- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/include/wx/mac/clipbrd.h b/include/wx/mac/clipbrd.h index a197ffa71e..62fe3e51c4 100644 --- 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 366ee6ce3a..aaa535b3fa 100644 --- 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: -- 2.47.2