wxStdButtonSizer Finalise --> Realize

[wxWidgets.git] / src / common / uri.cpp

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index abc46f49b92603ed0bc862bff722fdbe2dde2b80..be18e65e5d3fd59a257cd3e2749c4ddd315c885a 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -62,7 +62,7 @@ wxURI::wxURI(const wxString& uri) : m_hostType(wxURI_REGNAME), m_fields(0)
     Create(uri);
 }
 
     Create(uri);
 }
 

-wxURI::wxURI(const wxURI& uri)  : m_hostType(wxURI_REGNAME), m_fields(0)
+wxURI::wxURI(const wxURI& uri)  : wxObject(), m_hostType(wxURI_REGNAME), m_fields(0)

 {
     Assign(uri);
 }
 {
     Assign(uri);
 }


@@ -79,7 +79,7 @@ wxURI::~wxURI()
 void wxURI::Clear()
 {
     m_scheme = m_user = m_server = m_port = m_path =
 void wxURI::Clear()
 {
     m_scheme = m_user = m_server = m_port = m_path =

-    m_query = m_fragment = wxT("");
+    m_query = m_fragment = wxEmptyString;

 
     m_hostType = wxURI_REGNAME;
 
 
     m_hostType = wxURI_REGNAME;
 


@@ -401,7 +401,7 @@ const wxChar* wxURI::ParseScheme(const wxChar* uri)
         }
         else
             //relative uri with relative path reference
         }
         else
             //relative uri with relative path reference

-            m_scheme = wxT("");
+            m_scheme = wxEmptyString;

     }
 //    else
         //relative uri with _possible_ relative path reference
     }
 //    else
         //relative uri with _possible_ relative path reference


@@ -450,7 +450,7 @@ const wxChar* wxURI::ParseUser(const wxChar* uri)
         uricopy = ++uri;
     }
     else
         uricopy = ++uri;
     }
     else

-        m_user = wxT("");
+        m_user = wxEmptyString;

 
     return uricopy;
 }
 
     return uricopy;
 }


@@ -1227,7 +1227,7 @@ bool wxURI::IsDigit(const wxChar& c)
 
 // ---------------------------------------------------------------------------
 //
 
 // ---------------------------------------------------------------------------
 //

-//                        wxURL Compatability
+//                        wxURL Compatibility

 //
 // ---------------------------------------------------------------------------
 
 //
 // ---------------------------------------------------------------------------