added wxTextEntry::AutoComplete() and implemented it for wxGTK

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

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index a5151947ef9a17b85440b69ee79eda4234348657..bcdd7eae660447ad11e6267d0c6408c4b24abc28 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -23,6 +23,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+

 #include "wx/uri.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/uri.h"
 
 // ---------------------------------------------------------------------------


@@ -93,7 +97,10 @@ const wxChar* wxURI::Create(const wxString& uri)
     if (m_fields)
         Clear();
 
     if (m_fields)
         Clear();
 

-    return Parse(uri);
+    // FIXME-UTF8: rewrite ParseXXX() methods using iterators
+    // NB: using wxWxCharBuffer instead of just c_str() avoids keeping
+    //     converted string in memory for longer than needed
+    return Parse(wxWxCharBuffer(uri.c_str()));

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -374,7 +381,7 @@ bool wxURI::IsReference() const
 // URI-reference = URI / relative
 // ---------------------------------------------------------------------------
 
 // URI-reference = URI / relative
 // ---------------------------------------------------------------------------
 

-const wxChar* wxURI::Parse(const wxChar* uri)
+const wxChar* wxURI::Parse(const wxChar *uri)

 {
     uri = ParseScheme(uri);
     uri = ParseAuthority(uri);
 {
     uri = ParseScheme(uri);
     uri = ParseAuthority(uri);


@@ -389,7 +396,7 @@ const wxChar* wxURI::Parse(const wxChar* uri)
 // Individual parsers for each URI component
 // ---------------------------------------------------------------------------
 
 // Individual parsers for each URI component
 // ---------------------------------------------------------------------------
 

-const wxChar* wxURI::ParseScheme(const wxChar* uri)
+const wxChar* wxURI::ParseScheme(const wxChar *uri)

 {
     wxASSERT(uri != NULL);
 
 {
     wxASSERT(uri != NULL);