X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cf73271dd6f442a98e86b559d4a55c37e25b99f..a75124d0da255513e83d2e62f963dd849829466b:/include/wx/mac/carbon/clipbrd.h diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h index 34bb3e3129..0c80b03c26 100644 --- a/include/wx/mac/carbon/clipbrd.h +++ b/include/wx/mac/carbon/clipbrd.h @@ -2,8 +2,8 @@ // Name: clipbrd.h // Purpose: Clipboard functionality. // Note: this functionality is under review, and -// is derived from wxWindows 1.xx code. Please contact -// the wxWindows developers for further information. +// is derived from wxWidgets 1.xx code. Please contact +// the wxWidgets developers for further information. // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -15,28 +15,26 @@ #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 +#include "wx/mac/corefoundation/cfref.h" + //----------------------------------------------------------------------------- // wxClipboard //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObject; +class WXDLLIMPEXP_FWD_CORE wxDataObject; class WXDLLEXPORT wxClipboard : public wxClipboardBase { DECLARE_DYNAMIC_CLASS(wxClipboard) public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); @@ -67,15 +65,12 @@ 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: wxDataObject *m_data; bool m_open; + wxCFRef m_pasteboard; }; #endif // wxUSE_CLIPBOARD -#endif - // _WX_CLIPBRD_H_ +#endif // _WX_CLIPBRD_H_