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 aa46abbb0057ddc26e5a382339936a152105a581..e880b5ffaa21cc3eb8b1e2a9550ffd9d64984177 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -16,23 +16,21 @@
 #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
 //-----------------------------------------------------------------------------
 
 class wxClipboard;
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
-
-void wxInitClipboard();
-void wxDoneClipboard();
+class wxClipboardModule;
 
 //-----------------------------------------------------------------------------
 // global data
@@ -44,7 +42,7 @@ extern wxClipboard* wxTheClipboard;
 // wxClipboard
 //-----------------------------------------------------------------------------
 
-class  wxClipboard: public wxObject
+class wxClipboard: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxClipboard)
 
@@ -53,19 +51,60 @@ public:
   wxClipboard();
   ~wxClipboard();
 
-  virtual void SetData( wxDataObject *data );
-  virtual void *GetData( wxDataFormat format, size_t *length );
-  virtual bool IsAvailable( wxDataFormat format );
+  /* 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 );
+  
+  /* ask if data in correct format is available */
+  virtual bool IsSupported( wxDataObject &data );
+  
+  /* 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 
+  /* implementation */ 
+ 
+  bool              m_open;
+  
+  bool              m_ownsClipboard;
+  bool              m_ownsPrimarySelection;
   
-  wxDataObject  *m_data;
-  char          *m_sentString, 
-               *m_receivedString;
-  void          *m_receivedTargets;
-  size_t         m_receivedLength;
-  GtkWidget     *m_clipboardWidget;
+  wxDataBroker     *m_dataBroker;
+  GtkWidget        *m_clipboardWidget;
+  
+  bool              m_formatSupported;
+  GdkAtom           m_targetRequested;
+
+  wxDataObject      *m_receivedData;
 };
 
+//-----------------------------------------------------------------------------
+// wxClipboardModule
+//-----------------------------------------------------------------------------
+
+class wxClipboardModule: public wxModule
+{
+  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
+  
+public:
+    wxClipboardModule() {}
+    bool OnInit();
+    void OnExit();
+};
+
+#endif
+
+   // wxUSE_CLIPBOARD
+
 #endif
     // __GTKCLIPBOARDH__