Various small fixes

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 5f7a92eead4d654426a58d8f1ba164270e2a078f..e880b5ffaa21cc3eb8b1e2a9550ffd9d64984177 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_CLIPBOARD
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/dataobj.h"
@@ -48,35 +51,35 @@ public:
   wxClipboard();
   ~wxClipboard();
 
-  // open the clipboard before SetData() and GetData()
+  /* open the clipboard before SetData() and GetData() */
   virtual bool Open();
   
-  // close the clipboard after SetData() and GetData()
+  /* close the clipboard after SetData() and GetData() */
   virtual void Close();
   
-  // can be called several times
+  /* set the clipboard data. all other formats will be deleted. */
   virtual bool SetData( wxDataObject *data );
 
-  // format available on the clipboard ? 
-  // supply ID if private format, the same as wxPrivateDataObject::SetId() 
-  virtual bool IsSupportedFormat( wxDataFormat format, const wxString &id = "" );
+  /* add to the clipboard data. */
+  virtual bool AddData( wxDataObject *data );
   
-  // fill data with data on the clipboard (if available)
-  virtual bool GetData( wxDataObject *data );
+  /* ask if data in correct format is available */
+  virtual bool IsSupported( wxDataObject &data );
   
-  // clears wxTheClipboard and the system's clipboard if possible
+  /* 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();
 
- // implementation 
- 
-  GdkAtom    GetTargetAtom( wxDataFormat format, const wxString &id = "" );
+  /* implementation */ 
  
   bool              m_open;
   
-  wxList            m_dataObjects;
-  char             *m_sentString, 
-                  *m_receivedString;
-  void             *m_receivedTargets;
+  bool              m_ownsClipboard;
+  bool              m_ownsPrimarySelection;
+  
+  wxDataBroker     *m_dataBroker;
   GtkWidget        *m_clipboardWidget;
   
   bool              m_formatSupported;
@@ -99,6 +102,9 @@ public:
     void OnExit();
 };
 
+#endif
+
+   // wxUSE_CLIPBOARD
 
 #endif
     // __GTKCLIPBOARDH__