Deprecated methosd markup (documented).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/uri.tex b/docs/latex/wx/uri.tex
index 95109a8b640878cd172d2d99bb9324ade16a4179..6b06deb7f0b86959e33e7cff973cb2b75ac4bed7 100644 (file)
--- a/docs/latex/wx/uri.tex
+++ b/docs/latex/wx/uri.tex
@@ -114,7 +114,7 @@ Builds the URI from its individual components, adds proper seperators, and
 returns escape sequences to normal characters.
 
 Note that it is preferred to call this over Unescape(BuildURI()) since
 returns escape sequences to normal characters.
 
 Note that it is preferred to call this over Unescape(BuildURI()) since

-BuildUnescapedURI performs some optimizations over the plain method.
+\helpref{BuildUnescapedURI}{wxuribuildunescapeduri} performs some optimizations over the plain method.

 
 
 \membersection{wxURI::Create}\label{wxuricreate}
 
 
 \membersection{wxURI::Create}\label{wxuricreate}


@@ -330,9 +330,9 @@ to 2396}
 Translates all escape sequences (% hex hex) of \arg{uri} into
 normal characters and returns the result.
 
 Translates all escape sequences (% hex hex) of \arg{uri} into
 normal characters and returns the result.
 

-This is the preferred over wxURL::ConvertFromURI.
+This is the preferred over deprecated wxURL::ConvertFromURI.

 
 

-If you want to unescape an entire wxURI, use BuildUnescapedURI instead,
+If you want to unescape an entire wxURI, use \helpref{BuildUnescapedURI}{wxuribuildunescapeduri} instead,

 as it performs some optimizations over this method.
 
 \docparam{uri}{string with escaped characters to convert}
 as it performs some optimizations over this method.
 
 \docparam{uri}{string with escaped characters to convert}

diff --git a/include/wx/url.h b/include/wx/url.h
index 89e3e34e74c5526e5db4d72be28aaf706d2dbe0f..ea48335c543decf0c8709959579ae2949620e630 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -76,13 +76,13 @@ public:
     wxString GetPath() const         { return m_path; }
 
     //Use wxURI instead - this does not work that well
     wxString GetPath() const         { return m_path; }
 
     //Use wxURI instead - this does not work that well

-    static wxString ConvertToValidURI(
+    wxDEPRECATED( static wxString ConvertToValidURI(

                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")
                         const wxString& uri,
                         const wxChar* delims = wxT(";/?:@&=+$,")

-                    );
+                  ) );

 
     //Use wxURI::Unescape instead
 
     //Use wxURI::Unescape instead

-    static wxString ConvertFromURI(const wxString& uri);
+    wxDEPRECATED( static wxString ConvertFromURI(const wxString& uri) );

 #endif
 
 protected:
 #endif
 
 protected: