Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / clipbrd.h

diff --git a/interface/wx/clipbrd.h b/interface/wx/clipbrd.h
index ca3dec1783bfa09b51b932e5a2d5a44922c709c9..3b1ca4d83e4a7bbc45952dc20fc0c883af90b5a3 100644 (file)
--- a/interface/wx/clipbrd.h
+++ b/interface/wx/clipbrd.h
@@ -2,8 +2,7 @@
 // Name:        clipbrd.h
 // Purpose:     interface of wxClipboard
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -35,7 +34,7 @@
     // Write some text to the clipboard
     if (wxTheClipboard->Open())
     {
-        // This data objects are held by the clipboard, 
+        // This data objects are held by the clipboard,
         // so do not delete them in the app.
         wxTheClipboard->SetData( new wxTextDataObject("Some text") );
         wxTheClipboard->Close();
@@ -49,7 +48,7 @@
             wxTextDataObject data;
             wxTheClipboard->GetData( data );
             wxMessageBox( data.GetText() );
-        }  
+        }
         wxTheClipboard->Close();
     }
     @endcode
@@ -102,6 +101,9 @@ public:
         (possibly eating memory), otherwise the clipboard will be emptied on
         exit.
 
+        Currently this method is not implemented in X11-based ports, i.e.
+        wxGTK, wxX11 and wxMotif and always returns @false there.
+
         @return @false if the operation is unsuccessful for any reason.
     */
     virtual bool Flush();
@@ -173,6 +175,12 @@ public:
         normal clipboard contents with the currently selected text on the other
         platforms.
     */
-    void UsePrimarySelection(bool primary = true);
+    virtual void UsePrimarySelection(bool primary = false);
+
+    /**
+       Returns the global instance (wxTheClipboard) of the clipboard object.
+    */
+    static wxClipboard *Get();
+
 };