#ifdef wxUSE_LIBJPEG changed to #if wxUSELIBJPEG

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

diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 55a9e8f462614ea388873dbaceca50f023086130..e880b5ffaa21cc3eb8b1e2a9550ffd9d64984177 100644 (file)
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -57,11 +57,17 @@ public:
   /* close the clipboard after SetData() and GetData() */
   virtual void Close();
   
   /* close the clipboard after SetData() and GetData() */
   virtual void Close();
   

-  /* set the clipboard data. the clipboard will delete the broker later */
-  virtual bool SetData( wxDataBroker *data );
+  /* 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 );
+  
+  /* ask if data in correct format is available */
+  virtual bool IsSupported( wxDataObject &data );
+  

   /* fill data with data on the clipboard (if available) */
   /* 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();
   
   /* clears wxTheClipboard and the system's clipboard if possible */
   virtual void Clear();