X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc86cb34c3a8f141686339f1285cf259dec5faaa..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/gtk1/clipbrd.h

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index aa46abbb00..0bc454dc22 100644
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -15,57 +15,74 @@
 #pragma interface
 #endif
 
-#include "wx/defs.h"
+#if wxUSE_CLIPBOARD
+
 #include "wx/object.h"
 #include "wx/list.h"
+#include "wx/dataobj.h"
 #include "wx/control.h"
-#include "wx/dnd.h"      // for wxDataObject
+#include "wx/module.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxClipboard
+// ----------------------------------------------------------------------------
 
-class wxClipboard;
+class wxClipboard : public wxClipboardBase
+{
+public:
+    wxClipboard();
+    ~wxClipboard();
 
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
+    // open the clipboard before SetData() and GetData()
+    virtual bool Open();
 
-void wxInitClipboard();
-void wxDoneClipboard();
+    // close the clipboard after SetData() and GetData()
+    virtual void Close();
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
 
-extern wxClipboard* wxTheClipboard;
+    // set the clipboard data. all other formats will be deleted.
+    virtual bool SetData( wxDataObject *data );
 
-//-----------------------------------------------------------------------------
-// wxClipboard
-//-----------------------------------------------------------------------------
+    // add to the clipboard data.
+    virtual bool AddData( wxDataObject *data );
 
-class  wxClipboard: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxClipboard)
+    // ask if data in correct format is available
+    virtual bool IsSupported( const wxDataFormat& format );
 
-public:
- 
-  wxClipboard();
-  ~wxClipboard();
-
-  virtual void SetData( wxDataObject *data );
-  virtual void *GetData( wxDataFormat format, size_t *length );
-  virtual bool IsAvailable( wxDataFormat format );
-
- // implementation 
-  
-  wxDataObject  *m_data;
-  char          *m_sentString, 
-		*m_receivedString;
-  void          *m_receivedTargets;
-  size_t         m_receivedLength;
-  GtkWidget     *m_clipboardWidget;
+    // fill data with data on the clipboard (if available)
+    virtual bool GetData( wxDataObject& data );
+
+    // 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;
+    bool              m_ownsPrimarySelection;
+    wxDataObject     *m_data;
+
+    GtkWidget        *m_clipboardWidget;  /* for getting and offering data */
+    GtkWidget        *m_targetsWidget;    /* for getting list of supported formats */
+    bool              m_waiting;          /* querying data or formats is asynchronous */
+
+    bool              m_formatSupported;
+    GdkAtom           m_targetRequested;
+    bool              m_usePrimary;
+    wxDataObject     *m_receivedData;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
+#endif
+   // wxUSE_CLIPBOARD
+
 #endif
     // __GTKCLIPBOARDH__