Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/gtk/clipbrd.h b/include/wx/gtk/clipbrd.h
index 913379cac7631cd26f89afb2ce9434d1f7d83165..d940100715ed0f7970122b079eceb66e8e23c342 100644 (file)
--- a/include/wx/gtk/clipbrd.h
+++ b/include/wx/gtk/clipbrd.h
@@ -63,14 +63,18 @@ public:
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available
     virtual bool AddData( wxDataObject *data );
 
     // ask if data in correct format is available

-    virtual bool IsSupported( wxDataObject &data );
+    virtual bool IsSupported( wxDataFormat format );

 
     // fill data with data on the clipboard (if available)
 
     // fill data with data on the clipboard (if available)

-    virtual bool GetData( wxDataObject &data );
+    virtual bool GetData( wxDataObject *data );

 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
 
     // 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;
     // implementation
 
     bool              m_open;


@@ -79,11 +83,13 @@ public:
     bool              m_ownsPrimarySelection;
 
     wxDataBroker     *m_dataBroker;
     bool              m_ownsPrimarySelection;
 
     wxDataBroker     *m_dataBroker;

-    GtkWidget        *m_clipboardWidget;
+    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_formatSupported;
     GdkAtom           m_targetRequested;

-
+    bool              m_usePrimary;

     wxDataObject      *m_receivedData;
 };
 
     wxDataObject      *m_receivedData;
 };