removed extremely user-unfriendly translations

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index eae17c35cae21795c0b4afd983e4e72790bc5829..16e2689e9a8923eca95a0df60c43d000b0ba27c1 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -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,6 +28,9 @@
 #include "wx/module.h"
 #include "wx/url.h"
 
+#include <string.h>
+#include <ctype.h>
+
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 
@@ -36,11 +38,12 @@ IMPLEMENT_CLASS(wxURL, wxObject)
 wxProtoInfo *wxURL::ms_protocols = NULL;
 
 // Enforce linking of protocol classes:
-USE_PROTOCOL(wxHTTP)
-USE_PROTOCOL(wxFTP)
 USE_PROTOCOL(wxFileProto)
 
 #if wxUSE_SOCKETS
+USE_PROTOCOL(wxHTTP)
+USE_PROTOCOL(wxFTP)
+
     wxHTTP *wxURL::ms_proxyDefault = NULL;
     bool wxURL::ms_useDefaultProxy = FALSE;
 #endif
@@ -62,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 )
         {
@@ -384,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);
@@ -520,3 +523,6 @@ void wxURLModule::OnExit()
 }
 
 #endif // wxUSE_SOCKETS
+
+#endif // wxUSE_URL
+