X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..0b49ccf8d66e2568e2b0de85c25b406aad39f3b1:/src/common/url.cpp

diff --git a/src/common/url.cpp b/src/common/url.cpp
index b6c54cca45..e64d31c381 100644
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,8 +20,7 @@
 #pragma hdrstop
 #endif
 
-#include <string.h>
-#include <ctype.h>
+#if wxUSE_URL
 
 #include "wx/string.h"
 #include "wx/list.h"
@@ -29,13 +28,22 @@
 #include "wx/module.h"
 #include "wx/url.h"
 
+#include <string.h>
+#include <ctype.h>
+
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 
 // Protocols list
 wxProtoInfo *wxURL::ms_protocols = NULL;
 
+// Enforce linking of protocol classes:
+USE_PROTOCOL(wxFileProto)
+
 #if wxUSE_SOCKETS
+USE_PROTOCOL(wxHTTP)
+USE_PROTOCOL(wxFTP)
+
     wxHTTP *wxURL::ms_proxyDefault = NULL;
     bool wxURL::ms_useDefaultProxy = FALSE;
 #endif
@@ -57,7 +65,7 @@ wxURL::wxURL(const wxString& url)
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
-        SetDefaultProxy(getenv("HTTP_PROXY"));
+        SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );
 
         if ( !ms_proxyDefault )
         {
@@ -379,7 +387,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             return;
 
         hostname = tmp_str(0, pos);
-        port = tmp_str(pos, tmp_str.Length()-pos);
+        port = tmp_str(pos+1, tmp_str.Length()-pos);
 
         addr.Hostname(hostname);
         addr.Service(port);
@@ -515,3 +523,6 @@ void wxURLModule::OnExit()
 }
 
 #endif // wxUSE_SOCKETS
+
+#endif // wxUSE_URL
+