fixed compilation and added support for all 4 images (as a side effect) to the

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index e880b5ffaa21cc3eb8b1e2a9550ffd9d64984177..d940100715ed0f7970122b079eceb66e8e23c342 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/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

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


@@ -42,50 +42,55 @@ 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();
-
-  /* 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 */ 
- 
-  bool              m_open;
-  
-  bool              m_ownsClipboard;
-  bool              m_ownsPrimarySelection;
-  
-  wxDataBroker     *m_dataBroker;
-  GtkWidget        *m_clipboardWidget;
-  
-  bool              m_formatSupported;
-  GdkAtom           m_targetRequested;
-
-  wxDataObject      *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();
+
+    /// If primary == TRUE, use primary selection in all further ops,
+    /// primary=FALSE resets it.
+    inline void UsePrimarySelection(bool primary = TRUE) { m_usePrimary = primary; }
+    
+    // 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;
+    bool              m_usePrimary;
+    wxDataObject      *m_receivedData;

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


@@ -95,7 +100,7 @@ public:
 class wxClipboardModule: public wxModule
 {
   DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 class wxClipboardModule: public wxModule
 {
   DECLARE_DYNAMIC_CLASS(wxClipboardModule)

-  
+

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