X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1ee679c2e3f48bc4f2607e35033ed5505ed6665..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/clipbrd.h

diff --git a/include/wx/motif/clipbrd.h b/include/wx/motif/clipbrd.h
index 6b675bc645..7aecda908d 100644
--- a/include/wx/motif/clipbrd.h
+++ b/include/wx/motif/clipbrd.h
@@ -1,9 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipbrd.h
+// Name:        wx/motif/clipbrd.h
 // Purpose:     Clipboard functionality.
-//              Note: this functionality is under review, and
-//              is derived from wxWindows 1.xx code. Please contact
-//              the wxWindows developers for further information.
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
@@ -15,15 +12,15 @@
 #ifndef _WX_CLIPBRD_H_
 #define _WX_CLIPBRD_H_
 
-#ifdef __GNUG__
-#pragma interface "clipbrd.h"
-#endif
-
 #if wxUSE_CLIPBOARD
 
-#include "wx/dataobj.h"
+class WXDLLIMPEXP_CORE wxDataObject;
+struct wxDataIdToDataObject;
 
-#include "wx/module.h"
+#include "wx/list.h"
+
+WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
+WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
 
 bool WXDLLEXPORT wxOpenClipboard();
 bool WXDLLEXPORT wxClipboardOpen();
@@ -40,11 +37,11 @@ bool WXDLLEXPORT wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatN
 // 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();
@@ -52,33 +49,38 @@ public:
     // close the clipboard after SetData() and GetData()
     virtual void Close();
 
-    // can be called several times
+    // opened?
+    virtual bool IsOpened() const { return m_open; }
+
+    // replaces the data on the clipboard with data
     virtual bool SetData( wxDataObject *data );
 
+    // adds data to the clipboard
+    virtual bool AddData( wxDataObject *data );
+
     // format available on the clipboard ?
-    // supply ID if private format, the same as wxPrivateDataObject::SetId()
-    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();
 
-    // implementation from now on
+    virtual void UsePrimarySelection(bool primary = true)
+    { m_usePrimary = primary; }
 
+    // implementation from now on
     bool              m_open;
-    wxList            m_data;
+    wxDataObjectList  m_data;
     bool              m_usePrimary;
+    wxDataIdToDataObjectList m_idToObject;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
-/* The clipboard */
-WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
-
 #endif // wxUSE_CLIPBOARD
 
 #endif
-    // _WX_CLIPBRD_H_
+// _WX_CLIPBRD_H_