X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/x11/clipbrd.h diff --git a/include/wx/x11/clipbrd.h b/include/wx/x11/clipbrd.h index eff7593f6e..48a7c70350 100644 --- a/include/wx/x11/clipbrd.h +++ b/include/wx/x11/clipbrd.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.h +// Name: wx/x11/clipbrd.h // Purpose: Clipboard functionality. // Author: Robert Roebling // Created: 17/09/98 @@ -8,12 +8,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __X11CLIPBOARDH__ -#define __X11CLIPBOARDH__ - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif +#ifndef _WX_X11_CLIPBRD_H_ +#define _WX_X11_CLIPBRD_H_ #if wxUSE_CLIPBOARD @@ -31,7 +27,7 @@ class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase { public: wxClipboard(); - ~wxClipboard(); + virtual ~wxClipboard(); // open the clipboard before SetData() and GetData() virtual bool Open(); @@ -57,11 +53,6 @@ public: // clears wxTheClipboard and the system's clipboard if possible virtual void Clear(); - // If primary == TRUE, use primary selection in all further ops, - // primary == FALSE resets it. - virtual void UsePrimarySelection(bool primary = TRUE) - { m_usePrimary = primary; } - // implementation from now on bool m_open; bool m_ownsClipboard; @@ -74,15 +65,12 @@ public: bool m_formatSupported; Atom m_targetRequested; - bool m_usePrimary; wxDataObject *m_receivedData; private: DECLARE_DYNAMIC_CLASS(wxClipboard) }; -#endif - // wxUSE_CLIPBOARD +#endif // wxUSE_CLIPBOARD -#endif - // __X11CLIPBOARDH__ +#endif // _WX_X11_CLIPBRD_H_