X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f536e0f24b3bf8358a5e1cb960267d5a3abe5071..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/clipbrd.h?ds=inline diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index 67f9d9d4fb..ee04acf8f7 100644 --- a/include/wx/msw/clipbrd.h +++ b/include/wx/msw/clipbrd.h @@ -12,10 +12,6 @@ #ifndef _WX_CLIPBRD_H_ #define _WX_CLIPBRD_H_ -#ifdef __GNUG__ -#pragma interface "clipbrd.h" -#endif - #if wxUSE_CLIPBOARD #include "wx/list.h" @@ -51,14 +47,14 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, // wxClipboard //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDataObject; -class WXDLLEXPORT wxClipboard : public wxObject +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(); @@ -76,10 +72,10 @@ public: virtual bool AddData( wxDataObject *data ); // ask if data in correct format is available - virtual bool IsSupported( wxDataFormat format ); + virtual bool IsSupported( const wxDataFormat& format ); // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject *data ); + virtual bool GetData( wxDataObject& data ); // clears wxTheClipboard and the system's clipboard if possible virtual void Clear(); @@ -89,13 +85,11 @@ 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: - bool m_clearOnExit; + IDataObject *m_lastDataObject; + bool m_isOpened; }; #endif // wxUSE_CLIPBOARD -#endif - // _WX_CLIPBRD_H_ + +#endif // _WX_CLIPBRD_H_