X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..99c75ebc5e447e1bb25439e22f07130583dc5783:/include/wx/mac/carbon/clipbrd.h diff --git a/include/wx/mac/carbon/clipbrd.h b/include/wx/mac/carbon/clipbrd.h index 0a3c433e4b..0c80b03c26 100644 --- a/include/wx/mac/carbon/clipbrd.h +++ b/include/wx/mac/carbon/clipbrd.h @@ -9,34 +9,32 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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_