X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15d83f726c215b06f2fdd15ece40d66d2f16a01d..9379c0d752144826342fa2688a77aa5cccea3d9b:/docs/latex/wx/url.tex

diff --git a/docs/latex/wx/url.tex b/docs/latex/wx/url.tex
index 187ab2bc42..cd06c6688f 100644
--- a/docs/latex/wx/url.tex
+++ b/docs/latex/wx/url.tex
@@ -1,7 +1,15 @@
 \section{\class{wxURL}}\label{wxurl}
 
+wxURL is a specialization of \helpref{wxURI}{wxuri} for parsing URLs.
+Please look at \helpref{wxURI}{wxuri} documentation for more info about the functions
+you can use to retrieve the various parts of the URL (scheme, server, port, etc).
+
+Supports standard assignment operators, copy constructors,
+and comparison operators.
+
 \wxheading{Derived from}
 
+\helpref{wxURI}{wxuri}\\
 \helpref{wxObject}{wxobject}
 
 \wxheading{Include files}
@@ -12,16 +20,6 @@
 
 \helpref{wxSocketBase}{wxsocketbase}, \helpref{wxProtocol}{wxprotocol}
 
-\wxheading{Example}
-
-\begin{verbatim}
-  wxURL url("http://a.host/a.dir/a.file");
-  wxInputStream *in_stream;
-
-  in_stream = url.GetInputStream();
-  // Then, you can use all IO calls of in_stream (See wxStream)
-\end{verbatim}
-
 % ----------------------------------------------------------------------------
 % Members
 % ----------------------------------------------------------------------------
@@ -30,13 +28,16 @@
 
 \membersection{wxURL::wxURL}\label{wxurlctor}
 
-\func{}{wxURL}{\param{const wxString\&}{ url}}
+\func{}{wxURL}{\param{const wxString\&}{ url = wxEmptyString}}
 
 Constructs a URL object from the string.  The URL must be valid according
 to RFC 1738.  In particular, file URLs must be of the format
-'file://hostname/path/to/file'.  It is valid to leave out the hostname
-but slashes must remain in place-- i.e. a file URL without a hostname must
-contain three consecutive slashes.
+{\tt file://hostname/path/to/file} otherwise \helpref{GetError}{wxurlgeterror}
+will return a value different from {\tt wxURL\_NOERR}.
+
+It is valid to leave out the hostname but slashes must remain in place - 
+i.e. a file URL without a hostname must contain three consecutive slashes 
+(e.g. {\tt file:///somepath/myfile}).
 
 \wxheading{Parameters}
 
@@ -48,15 +49,6 @@ contain three consecutive slashes.
 
 Destroys the URL object.
 
-%
-% GetProtocolName
-%
-\membersection{wxURL::GetProtocolName}\label{wxurlgetprotocolname}
-
-\constfunc{wxString}{GetProtocolName}{\void}
-
-Returns the name of the protocol which will be used to get the URL.
-
 %
 % GetProtocol
 %
@@ -66,15 +58,6 @@ Returns the name of the protocol which will be used to get the URL.
 
 Returns a reference to the protocol which will be used to get the URL.
 
-%
-% GetPath
-%
-\membersection{wxURL::GetPath}\label{wxurlgetpath}
-
-\func{wxString}{GetPath}{\void}
-
-Returns the path of the file to fetch. This path was encoded in the URL.
-
 %
 % GetError
 %
@@ -103,9 +86,25 @@ It can be one of these errors:
 
 \func{wxInputStream *}{GetInputStream}{\void}
 
-Creates a new input stream on the the specified URL. You can use all but seek
-functionality of wxStream. Seek isn't available on all stream. For example,
-http or ftp streams doesn't deal with it.
+Creates a new input stream on the specified URL. You can use all but seek
+functionality of wxStream. Seek isn't available on all streams. For example,
+HTTP or FTP streams don't deal with it.
+
+Note that this method is somewhat depreciated, all future wxWidgets applications
+should really use \helpref{wxFileSystem}{wxfilesystem} instead.
+
+Example:
+
+\begin{verbatim}
+  wxURL url("http://a.host/a.dir/a.file");
+  if (url.GetError() == wxURL_NOERR)
+  {
+      wxInputStream *in_stream;
+
+      in_stream = url.GetInputStream();
+      // Then, you can use all IO calls of in_stream (See wxStream)
+  }
+\end{verbatim}
 
 \wxheading{Return value}
 
@@ -115,6 +114,18 @@ Returns the initialized stream. You will have to delete it yourself.
 
 \helpref{wxInputStream}{wxinputstream}
 
+
+%
+% IsOk
+%
+\membersection{wxURL::IsOk}\label{wxurlgetisok}
+
+\constfunc{bool}{IsOk}{\void}
+
+Returns \true if this object is correctly initialized, i.e. if 
+\helpref{GetError}{wxurlgeterror} returns {\tt wxURL\_NOERR}.
+
+
 %
 % SetDefaultProxy
 %
@@ -146,13 +157,14 @@ Sets the proxy to use for this URL.
 
 \helpref{wxURL::SetDefaultProxy}{wxurlsetdefaultproxy}
 
+
 %
-% SetProxy
+% SetURL
 %
-\membersection{wxURL::ConvertToValidURI}\label{wxurlconverttovaliduri}
+\membersection{wxURL::SetURL}\label{wxurlseturl}
 
-\func{static wxString}{ConvertToValidURI}{\param{const wxString\&}{ uri}}
+\func{wxURLError}{SetURL}{\param{const wxString\&}{ url}}
 
-It converts a non-standardized URI to a valid network URI. It encodes non
-standard characters.
+Initializes this object with the given URL and returns {\tt wxURL\_NOERR}
+if it's valid (see \helpref{GetError}{wxurlgeterror} for more info).