fixes to previous commit

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index ed94d8ef8ed85fef20d0f482f285a6f17791ee5d..bc942af2a580acda9e102bd380745cc4e2a23577 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -4,20 +4,18 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKCLIPBOARDH__
 #define __GTKCLIPBOARDH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface
 #endif
 
-#include "wx/defs.h"
-
-#ifdef wxUSE_CLIPBOARD
+#if wxUSE_CLIPBOARD
 
 #include "wx/object.h"
 #include "wx/list.h"
@@ -25,85 +23,65 @@
 #include "wx/control.h"
 #include "wx/module.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxClipboard
+// ----------------------------------------------------------------------------
 
-class wxClipboard;
-class wxClipboardModule;
+class wxClipboard : public wxClipboardBase
+{
+public:
+    wxClipboard();
+    ~wxClipboard();
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    // open the clipboard before SetData() and GetData()
+    virtual bool Open();
 
-extern wxClipboard* wxTheClipboard;
+    // close the clipboard after SetData() and GetData()
+    virtual void Close();
 
-//-----------------------------------------------------------------------------
-// wxClipboard
-//-----------------------------------------------------------------------------
+    // query whether the clipboard is opened
+    virtual bool IsOpened() const;
 
-class wxClipboard: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxClipboard)
+    // set the clipboard data. all other formats will be deleted.
+    virtual bool SetData( wxDataObject *data );
 
-public:
- 
-  wxClipboard();
-  ~wxClipboard();
-
-  // open the clipboard before SetData() and GetData()
-  virtual bool Open();
-  
-  // close the clipboard after SetData() and GetData()
-  virtual void Close();
-  
-  // can be called several times
-  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 = "" );
-  
-  // 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 = "" );
- 
-  bool              m_open;
-  
-  bool              m_ownsClipboard;
-  bool              m_ownsPrimarySelection;
-  
-  wxList            m_dataObjects;
-  GtkWidget        *m_clipboardWidget;
-  
-  bool              m_formatSupported;
-  GdkAtom           m_targetRequested;
-
-  wxDataObject      *m_receivedData;
-};
+    // add to the clipboard data.
+    virtual bool AddData( wxDataObject *data );
 
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
+    // ask if data in correct format is available
+    virtual bool IsSupported( const wxDataFormat& format );
 
-class wxClipboardModule: public wxModule
-{
-  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-  
-public:
-    wxClipboardModule() {}
-    bool OnInit();
-    void OnExit();
+    // 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();
+
+    // If primary == TRUE, use primary selection in all further ops,
+    // primary == FALSE resets it.
+    virtual void UsePrimarySelection(bool primary = TRUE)
+        { m_usePrimary = primary; }
+    
+    // implementation from now on
+    bool              m_open;
+    bool              m_ownsClipboard;
+    bool              m_ownsPrimarySelection;
+    wxDataObject     *m_data;
+
+    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;
+    bool              m_usePrimary;
+    wxDataObject     *m_receivedData;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
 #endif
-
    // wxUSE_CLIPBOARD
 
 #endif