Trying to repair what CVS can do to source code

[wxWidgets.git] / include / wx / gtk / clipbrd.h

diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index b8d488a7471f4b66cc00a250b2f0b33548c2fb10..e880b5ffaa21cc3eb8b1e2a9550ffd9d64984177 100644 (file)
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -16,10 +16,13 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_CLIPBOARD
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/object.h"
 #include "wx/list.h"

+#include "wx/dataobj.h"

 #include "wx/control.h"
 #include "wx/control.h"

-#include "wx/dnd.h"      // for wxDataObject

 #include "wx/module.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/module.h"
 
 //-----------------------------------------------------------------------------


@@ -48,31 +51,41 @@ public:
   wxClipboard();
   ~wxClipboard();
 
   wxClipboard();
   ~wxClipboard();
 

-  virtual void SetData( wxDataObject *data );
+  /* open the clipboard before SetData() and GetData() */
+  virtual bool Open();
+  
+  /* close the clipboard after SetData() and GetData() */
+  virtual void Close();
+  
+  /* set the clipboard data. all other formats will be deleted. */
+  virtual bool SetData( wxDataObject *data );
+
+  /* add to the clipboard data. */
+  virtual bool AddData( wxDataObject *data );

   
   

-  virtual bool IsSupportedFormat( wxDataFormat format );
-  virtual bool ObtainData( wxDataFormat format );
+  /* ask if data in correct format is available */
+  virtual bool IsSupported( wxDataObject &data );

   
   

-  // call these after ObtainData()
-  virtual size_t GetDataSize() const;
-  virtual void GetDataHere( void *data ) const;
+  /* fill data with data on the clipboard (if available) */
+  virtual bool GetData( wxDataObject &data );

   
   

-  // clears wxTheClipboard and the system's clipboard if possible
+  /* clears wxTheClipboard and the system's clipboard if possible */

   virtual void Clear();
 
   virtual void Clear();
 

- // implementation 
+  /* implementation */ 
+ 
+  bool              m_open;
+  
+  bool              m_ownsClipboard;
+  bool              m_ownsPrimarySelection;

   
   

-  wxDataObject     *m_data;
-  char             *m_sentString, 
-                  *m_receivedString;
-  void             *m_receivedTargets;
+  wxDataBroker     *m_dataBroker;

   GtkWidget        *m_clipboardWidget;
   
   bool              m_formatSupported;
   GdkAtom           m_targetRequested;
 
   GtkWidget        *m_clipboardWidget;
   
   bool              m_formatSupported;
   GdkAtom           m_targetRequested;
 

-  size_t            m_receivedSize;
-  char              *m_receivedData;
+  wxDataObject      *m_receivedData;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -89,6 +102,9 @@ public:
     void OnExit();
 };
 
     void OnExit();
 };
 

+#endif
+
+   // wxUSE_CLIPBOARD

 
 #endif
     // __GTKCLIPBOARDH__
 
 #endif
     // __GTKCLIPBOARDH__