X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1dd989e1bf4c3667d27b3c27a9cf64a66484ee90..61b50a43aaaf29fe9c2f848958adafc496439123:/include/wx/gtk/clipbrd.h?ds=sidebyside diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h index 188ea58fcf..0bc454dc22 100644 --- a/include/wx/gtk/clipbrd.h +++ b/include/wx/gtk/clipbrd.h @@ -15,8 +15,6 @@ #pragma interface #endif -#include "wx/defs.h" - #if wxUSE_CLIPBOARD #include "wx/object.h" @@ -25,24 +23,11 @@ #include "wx/control.h" #include "wx/module.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxClipboard; -class wxClipboardModule; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern wxClipboard* wxTheClipboard; - -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxClipboard -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -class wxClipboard : public wxObject +class wxClipboard : public wxClipboardBase { public: wxClipboard(); @@ -54,6 +39,9 @@ public: // close the clipboard after SetData() and GetData() virtual void Close(); + // query whether the clipboard is opened + virtual bool IsOpened() const; + // set the clipboard data. all other formats will be deleted. virtual bool SetData( wxDataObject *data ); @@ -61,22 +49,20 @@ 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(); - // flushes the clipboard: not available under GTK - virtual bool Flush() { return FALSE; } - - /// If primary == TRUE, use primary selection in all further ops, - /// primary=FALSE resets it. - inline void UsePrimarySelection(bool primary = TRUE) { m_usePrimary = primary; } + // If primary == TRUE, use primary selection in all further ops, + // primary == FALSE resets it. + virtual void UsePrimarySelection(bool primary = TRUE) + { m_usePrimary = primary; } - // implementation + // implementation from now on bool m_open; bool m_ownsClipboard; bool m_ownsPrimarySelection; @@ -89,29 +75,13 @@ public: bool m_formatSupported; GdkAtom m_targetRequested; bool m_usePrimary; - wxDataObject *m_receivedData; - -private: - DECLARE_DYNAMIC_CLASS(wxClipboard) -}; + wxDataObject *m_receivedData; -//----------------------------------------------------------------------------- -// wxClipboardModule -//----------------------------------------------------------------------------- - -class wxClipboardModule: public wxModule -{ -public: - wxClipboardModule() {} - bool OnInit(); - void OnExit(); - private: - DECLARE_DYNAMIC_CLASS(wxClipboardModule) + DECLARE_DYNAMIC_CLASS(wxClipboard) }; #endif - // wxUSE_CLIPBOARD #endif