X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..94e2ed3b8db0220160c0b939782cd46914ec073a:/include/wx/mac/clipbrd.h?ds=sidebyside

diff --git a/include/wx/mac/clipbrd.h b/include/wx/mac/clipbrd.h
index 4d3658ed3c..62fe3e51c4 100644
--- a/include/wx/mac/clipbrd.h
+++ b/include/wx/mac/clipbrd.h
@@ -19,75 +19,63 @@
 #pragma interface "clipbrd.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/setup.h"
+#if wxUSE_CLIPBOARD
 
 #include "wx/list.h"
+#include "wx/module.h"
+#include "wx/dataobj.h"     // for wxDataFormat
 
-/* A clipboard client holds data belonging to the clipboard.
-   For plain text, a client is not necessary. */
-class WXDLLEXPORT wxClipboardClient : public wxObject
-{
-  DECLARE_ABSTRACT_CLASS(wxClipboardClient)
-
- public:
-  /* This list should be filled in with strings indicating the formats
-     this client can provide. Almost all clients will provide "TEXT".
-     Format names should be 4 characters long, so things will work
-     out on the Macintosh */
-  wxStringList formats;
-
-  /* This method is called when the client is losing the selection. */
-  virtual void BeingReplaced() = 0;
-
-  /* This method is called when someone wants the data this client is
-     supplying to the clipboard. "format" is a string indicating the
-     format of the data - one of the strings from the "formats"
-     list. "*size" should be filled with the size of the resulting
-     data. In the case of text, "*size" does not count the
-     NULL terminator. */
-  virtual char *GetData(char *format, long *size) = 0;
-};
+//-----------------------------------------------------------------------------
+// wxClipboard
+//-----------------------------------------------------------------------------
 
-/* ONE instance of this class: */
-class WXDLLEXPORT wxClipboard : public wxObject
+class WXDLLEXPORT wxDataObject;
+class WXDLLEXPORT wxClipboard : public wxClipboardBase
 {
-  DECLARE_DYNAMIC_CLASS(wxClipboard)
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
 
- public:
-  wxClipboardClient *clipOwner;
-  char *cbString, *sentString, *receivedString;
-  void *receivedTargets;
-  long receivedLength;
+public:
+    wxClipboard();
+    ~wxClipboard();
 
-  wxClipboard();
-  ~wxClipboard();
+    // open the clipboard before SetData() and GetData()
+    virtual bool Open();
 
-  /* Set the clipboard data owner. "time" comes from the event record. */
-  void SetClipboardClient(wxClipboardClient *, long time);
+    // close the clipboard after SetData() and GetData()
+    virtual void Close();
 
-  /* Set the clipboard string; does not require a client. */
-  void SetClipboardString(char *, long time);
+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
 
-  /* Get data from the clipboard in the format "TEXT". */
-  char *GetClipboardString(long time);
+    // set the clipboard data. all other formats will be deleted.
+    virtual bool SetData( wxDataObject *data );
 
-  /* Get data from the clipboard */
-  char *GetClipboardData(char *format, long *length, long time);
+    // add to the clipboard data.
+    virtual bool AddData( wxDataObject *data );
 
-  /* Get the clipboard client directly. Will be NULL if clipboard data
-     is a string, or if some other application owns the clipboard. 
-     This can be useful for shortcutting data translation, if the
-     clipboard user can check for a specific client. (This is used
-     by the wxMediaEdit class.) */
-  wxClipboardClient *GetClipboardClient();
-};
+    // ask if data in correct format is available
+    virtual bool IsSupported( const wxDataFormat& format );
+
+    // fill data with data on the clipboard (if available)
+    virtual bool GetData( wxDataObject& data );
 
-/* Initialize wxTheClipboard. Can be called repeatedly */
-void WXDLLEXPORT wxInitClipboard();
+    // clears wxTheClipboard and the system's clipboard if possible
+    virtual void Clear();
+
+    // flushes the clipboard: this means that the data which is currently on
+    // clipboard will stay available even after the application exits (possibly
+    // 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:
+    wxDataObject     *m_data;
+    bool              m_open;
+};
 
-/* The clipboard */
-WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
+#endif // wxUSE_CLIPBOARD
 
 #endif
     // _WX_CLIPBRD_H_