X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b453e1b24bfa07074b29f1599a731c0c58d731b0..7946d7deaac081a745dc616a5eb13ae864865fa2:/docs/latex/wx/clipbrd.tex

diff --git a/docs/latex/wx/clipbrd.tex b/docs/latex/wx/clipbrd.tex
index 151509e42d..9b9825c01a 100644
--- a/docs/latex/wx/clipbrd.tex
+++ b/docs/latex/wx/clipbrd.tex
@@ -5,9 +5,11 @@ clipboard class from wxWindows 1.xx, which has the same name but a different imp
 
 To use the clipboard, you call member functions of the global {\bf wxTheClipboard} object.
 
+See also the \helpref{wxDataObject overview}{wxdataobjectoverview} for further information.
+
 Call \helpref{wxClipboard::Open}{wxclipboardopen} to get ownership of the clipboard. If this operation returns TRUE, you
-now own the clipboard. Call \helpref{wxClipboard::AddData}{wxclipboardadddata} to put data
-on the clipboard (one or more times), or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
+now own the clipboard. Call \helpref{wxClipboard::SetData}{wxclipboardsetdata} to put data
+on the clipboard, or \helpref{wxClipboard::GetData}{wxclipboardgetdata} to
 retrieve data from the clipboard. Call \helpref{wxClipboard::Close}{wxclipboardclose} to close
 the clipboard and relinquish ownership. You should keep the clipboard open only momentarily.
 
@@ -19,17 +21,17 @@ For example:
   {
     // This data objects are held by the clipboard, 
     // so do not delete them in the app.
-    wxTheClipboard->AddData( new wxTextDataObject("Some text") );
+    wxTheClipboard->SetData( new wxTextDataObject("Some text") );
     wxTheClipboard->Close();
   }
 
   // Read some text
   if (wxTheClipboard->Open())
   {
-    if (wxTheClipboard->IsSupported( "STRING" ))
+    if (wxTheClipboard->IsSupported( wxDF_TEXT ))
     {
       wxTextDataObject data;
-      wxTheClipboard->GetData( &data );
+      wxTheClipboard->GetData( data );
       wxMessageBox( data.GetText() );
     }  
     wxTheClipboard->Close();
@@ -66,8 +68,15 @@ Destructor.
 
 \func{bool}{AddData}{\param{wxDataObject*}{ data}}
 
-Call this function to add a data object to the clipboard. This function can be called several times
-to put different formats on the clipboard.
+Call this function to add the data object to the clipboard. You may call
+this function repeatedly after having cleared the clipboard using \helpref{wxClipboard::Clear}{wxclipboardclear}.
+
+After this function has been called, the clipboard owns the data, so do not delete
+the data explicitly.
+
+\wxheading{See also}
+
+\helpref{wxClipboard::SetData}{wxclipboardsetdata}
 
 \membersection{wxClipboard::Clear}\label{wxclipboardclear}
 
@@ -83,14 +92,20 @@ Call this function to close the clipboard, having opened it with \helpref{wxClip
 
 \membersection{wxClipboard::GetData}\label{wxclipboardgetdata}
 
-\func{bool}{GetData}{\param{wxDataObject*}{ data}}
+\func{bool}{GetData}{\param{wxDataObject\&}{ data}}
 
 Call this function to fill {\it data} with data on the clipboard, if available in the required
 format. Returns TRUE on success.
 
+\membersection{wxClipboard::IsOpened}\label{wxclipboardisopened}
+
+\constfunc{bool}{IsOpened}{\void}
+
+Returns TRUE if the clipboard has been opened.
+
 \membersection{wxClipboard::IsSupported}\label{wxclipboardissupported}
 
-\func{bool}{IsSupported}{\param{wxDataFormat}{ format}}
+\func{bool}{IsSupported}{\param{const wxDataFormat\&}{ format}}
 
 Returns TRUE if the format of the given data object is available on the clipboard.
 
@@ -114,12 +129,19 @@ Call this function to set the data object to the clipboard. This function will
 clear all previous contents in the clipboard, so calling it several times
 does not make any sense.
 
-\membersection{wxClipboard::UsePrimarySelection}\label{wxclipboaruseprimary}
+After this function has been called, the clipboard owns the data, so do not delete
+the data explicitly.
+
+\wxheading{See also}
+
+\helpref{wxClipboard::AddData}{wxclipboardadddata}
+
+\membersection{wxClipboard::UsePrimarySelection}\label{wxclipboarduseprimary}
 
-\func{void}{UsePrimarySelection}{\param(bool}{ primary = TRUE}
+\func{void}{UsePrimarySelection}{\param{bool}{ primary = TRUE}}
 
 On platforms supporting it (currently only GTK), selects the so called
 PRIMARY SELECTION as the clipboard as opposed to the normal clipboard,
-if primary is TRUE.
+if {\it primary} is TRUE.