X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12db77cab1054d288a2b3e2d07e58ad1d6386a53..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/motif/clipbrd.h diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h index e0baf4a4ac..6c2a0f8747 100644 --- a/include/wx/motif/clipbrd.h +++ b/include/wx/motif/clipbrd.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.h +// Name: wx/motif/clipbrd.h // Purpose: Clipboard functionality. // Author: Julian Smart // Modified by: @@ -12,34 +12,36 @@ #ifndef _WX_CLIPBRD_H_ #define _WX_CLIPBRD_H_ -#ifdef __GNUG__ - #pragma interface "clipbrd.h" -#endif - #if wxUSE_CLIPBOARD +class WXDLLIMPEXP_FWD_CORE wxDataObject; +struct wxDataIdToDataObject; + #include "wx/list.h" -bool WXDLLEXPORT wxOpenClipboard(); -bool WXDLLEXPORT wxClipboardOpen(); -bool WXDLLEXPORT wxCloseClipboard(); -bool WXDLLEXPORT wxEmptyClipboard(); -bool WXDLLEXPORT wxIsClipboardFormatAvailable(wxDataFormat dataFormat); -bool WXDLLEXPORT wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0); -wxObject* WXDLLEXPORT wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); -wxDataFormat WXDLLEXPORT wxEnumClipboardFormats(wxDataFormat dataFormat); -wxDataFormat WXDLLEXPORT wxRegisterClipboardFormat(char *formatName); -bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount); +WX_DECLARE_LIST(wxDataObject, wxDataObjectList); +WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList); + +WXDLLIMPEXP_CORE bool wxOpenClipboard(); +WXDLLIMPEXP_CORE bool wxClipboardOpen(); +WXDLLIMPEXP_CORE bool wxCloseClipboard(); +WXDLLIMPEXP_CORE bool wxEmptyClipboard(); +WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0); +WXDLLIMPEXP_CORE wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL); +WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat); +WXDLLIMPEXP_CORE wxDataFormat wxRegisterClipboardFormat(char *formatName); +WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount); //----------------------------------------------------------------------------- // wxClipboard //----------------------------------------------------------------------------- -class wxClipboard : public wxClipboardBase +class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); @@ -65,14 +67,10 @@ public: // clears wxTheClipboard and the system's clipboard if possible virtual void Clear(); - virtual void UsePrimarySelection(bool primary = TRUE) - { m_usePrimary = primary; } - // implementation from now on - bool m_open; - wxList m_data; - bool m_usePrimary; + wxDataObjectList m_data; + wxDataIdToDataObjectList m_idToObject; private: DECLARE_DYNAMIC_CLASS(wxClipboard) @@ -80,5 +78,4 @@ private: #endif // wxUSE_CLIPBOARD -#endif - // _WX_CLIPBRD_H_ +#endif // _WX_CLIPBRD_H_