X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e8335b0b7a5984e1c22364f4c45435fe697ae75..b052a864e9d5270fd40f9ee6021133d2c3cd3173:/include/wx/msw/clipbrd.h?ds=sidebyside diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h index bc4e18fdbe..2a760e2676 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" @@ -52,13 +48,13 @@ WXDLLEXPORT bool wxGetClipboardFormatName(wxDataFormat dataFormat, //----------------------------------------------------------------------------- class WXDLLEXPORT wxDataObject; -class WXDLLEXPORT wxClipboard : public wxObject +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,7 +72,7 @@ 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 ); @@ -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_