Since wxPanel is now AutoLayout aware, removed indirect auto layouting

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

diff --git a/include/wx/gtk1/clipbrd.h b/include/wx/gtk1/clipbrd.h
index 913379cac7631cd26f89afb2ce9434d1f7d83165..188ea58fcfb285d5c31f963d703647a5114d8928 100644 (file)
--- a/include/wx/gtk1/clipbrd.h
+++ b/include/wx/gtk1/clipbrd.h
@@ -44,8 +44,6 @@ extern wxClipboard* wxTheClipboard;
 
 class wxClipboard : public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-
 public:
     wxClipboard();
     ~wxClipboard();
@@ -63,28 +61,38 @@ public:
     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)
-    virtual bool GetData( wxDataObject &data );
+    virtual bool GetData( wxDataObject *data );
 
     // clears wxTheClipboard and the system's clipboard if possible
     virtual void Clear();
 
-    // implementation
-
+    // flushes the clipboard: not available under GTK
+    virtual bool Flush() { return FALSE; }
+    
+    /// 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;
+    wxDataObject     *m_data;
 
-    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_usePrimary;
     wxDataObject      *m_receivedData;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboard)
 };
 
 //-----------------------------------------------------------------------------
@@ -93,12 +101,13 @@ public:
 
 class wxClipboardModule: public wxModule
 {
-  DECLARE_DYNAMIC_CLASS(wxClipboardModule)
-
 public:
     wxClipboardModule() {}
     bool OnInit();
     void OnExit();
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxClipboardModule)
 };
 
 #endif