compilation fixes

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

diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index b8d488a7471f4b66cc00a250b2f0b33548c2fb10..508a3b0dd7fe2c5237dfd7fe7417a5d7aac4e9ab 100644 (file)
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -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"
 
 //-----------------------------------------------------------------------------


@@ -39,40 +42,51 @@ extern wxClipboard* wxTheClipboard;
 // wxClipboard
 //-----------------------------------------------------------------------------
 
 // wxClipboard
 //-----------------------------------------------------------------------------
 

-class wxClipboard: public wxObject
+class wxClipboard : public wxObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxClipboard)
+    DECLARE_DYNAMIC_CLASS(wxClipboard)

 
 public:
 
 public:

- 
-  wxClipboard();
-  ~wxClipboard();
-
-  virtual void SetData( wxDataObject *data );
-  
-  virtual bool IsSupportedFormat( wxDataFormat format );
-  virtual bool ObtainData( wxDataFormat format );
-  
-  // call these after ObtainData()
-  virtual size_t GetDataSize() const;
-  virtual void GetDataHere( void *data ) const;
-  
-  // clears wxTheClipboard and the system's clipboard if possible
-  virtual void Clear();
-
- // implementation 
-  
-  wxDataObject     *m_data;
-  char             *m_sentString, 
-                  *m_receivedString;
-  void             *m_receivedTargets;
-  GtkWidget        *m_clipboardWidget;
-  
-  bool              m_formatSupported;
-  GdkAtom           m_targetRequested;
-
-  size_t            m_receivedSize;
-  char              *m_receivedData;
+    wxClipboard();
+    ~wxClipboard();
+
+    // 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( wxDataFormat format );
+
+    // 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
+
+    bool              m_open;
+
+    bool              m_ownsClipboard;
+    bool              m_ownsPrimarySelection;
+
+    wxDataBroker     *m_dataBroker;
+    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;
+
+    wxDataObject      *m_receivedData;

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


@@ -82,13 +96,16 @@ public:
 class wxClipboardModule: public wxModule
 {
   DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 class wxClipboardModule: public wxModule
 {
   DECLARE_DYNAMIC_CLASS(wxClipboardModule)

-  
+

 public:
     wxClipboardModule() {}
     bool OnInit();
     void OnExit();
 };
 
 public:
     wxClipboardModule() {}
     bool OnInit();
     void OnExit();
 };
 

+#endif
+
+   // wxUSE_CLIPBOARD

 
 #endif
     // __GTKCLIPBOARDH__
 
 #endif
     // __GTKCLIPBOARDH__