MacHandleControlClick extended by mouseStillDown state for supporting things like...

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index c2e863f0b432495bef337d2f7cd6ba3455db6eb7..e64d31c38159615e8410867ccae50ad8d7515ab0 100644 (file)
--- 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
 // Created:     20/07/1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,8 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include <string.h>
-#include <ctype.h>
+#if wxUSE_URL

 
 #include "wx/string.h"
 #include "wx/list.h"
 
 #include "wx/string.h"
 #include "wx/list.h"


@@ -29,6 +28,9 @@
 #include "wx/module.h"
 #include "wx/url.h"
 
 #include "wx/module.h"
 #include "wx/url.h"
 

+#include <string.h>
+#include <ctype.h>
+

 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 
 IMPLEMENT_CLASS(wxProtoInfo, wxObject)
 IMPLEMENT_CLASS(wxURL, wxObject)
 


@@ -63,7 +65,7 @@ wxURL::wxURL(const wxString& url)
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
     {

-        SetDefaultProxy(getenv("HTTP_PROXY"));
+        SetDefaultProxy( wxGetenv(wxT("HTTP_PROXY")) );

 
         if ( !ms_proxyDefault )
         {
 
         if ( !ms_proxyDefault )
         {


@@ -385,7 +387,7 @@ void wxURL::SetProxy(const wxString& url_proxy)
             return;
 
         hostname = tmp_str(0, pos);
             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);
 
         addr.Hostname(hostname);
         addr.Service(port);


@@ -521,3 +523,6 @@ void wxURLModule::OnExit()
 }
 
 #endif // wxUSE_SOCKETS
 }
 
 #endif // wxUSE_SOCKETS

+
+#endif // wxUSE_URL
+