Make wxPORTRAIT and wxLANDSCAPE elements of wxPrintOrientation enum.

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 700cb18d7e59202335109af9dadf37250b61099f..cbca1ffeb3742858085cb15c53e92479aae99dae 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-IMPLEMENT_CLASS(wxProtoInfo, wxObject)

 IMPLEMENT_CLASS(wxURL, wxURI)
 
 // Protocols list
 IMPLEMENT_CLASS(wxURL, wxURI)
 
 // Protocols list


@@ -242,11 +241,11 @@ wxInputStream *wxURL::GetInputStream()
         size_t dwPasswordPos = m_userinfo.find(':');
 
         if (dwPasswordPos == wxString::npos)
         size_t dwPasswordPos = m_userinfo.find(':');
 
         if (dwPasswordPos == wxString::npos)

-            m_protocol->SetUser(m_userinfo);
+            m_protocol->SetUser(Unescape(m_userinfo));

         else
         {
         else
         {

-            m_protocol->SetUser(m_userinfo(0, dwPasswordPos));
-            m_protocol->SetPassword(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1));
+            m_protocol->SetUser(Unescape(m_userinfo(0, dwPasswordPos)));
+            m_protocol->SetPassword(Unescape(m_userinfo(dwPasswordPos+1, m_userinfo.length() + 1)));

         }
     }
 
         }
     }
 


@@ -267,7 +266,11 @@ wxInputStream *wxURL::GetInputStream()
     wxIPV4address addr;
 
     // m_protoinfo is NULL when we use a proxy
     wxIPV4address addr;
 
     // m_protoinfo is NULL when we use a proxy

-    if (!m_useProxy && m_protoinfo->m_needhost)
+    if (
+#if wxUSE_PROTOCOL_HTTP
+         !m_useProxy &&
+#endif // wxUSE_PROTOCOL_HTTP
+         m_protoinfo->m_needhost )

     {
         if (!addr.Hostname(m_server))
         {
     {
         if (!addr.Hostname(m_server))
         {


@@ -283,13 +286,15 @@ wxInputStream *wxURL::GetInputStream()
             return NULL;
         }
     }
             return NULL;
         }
     }

-#endif
+#endif // wxUSE_SOCKETS

 
     wxString fullPath;
 
 
     wxString fullPath;
 

+#if wxUSE_PROTOCOL_HTTP

     // When we use a proxy, we have to pass the whole URL to it.
     if (m_useProxy)
         fullPath += m_url;
     // When we use a proxy, we have to pass the whole URL to it.
     if (m_useProxy)
         fullPath += m_url;

+#endif // wxUSE_PROTOCOL_HTTP

 
     if(m_path.empty())
         fullPath += wxT("/");
 
     if(m_path.empty())
         fullPath += wxT("/");


@@ -406,6 +411,8 @@ void wxURL::SetProxy(const wxString& url_proxy)
 class wxURLModule : public wxModule
 {
 public:
 class wxURLModule : public wxModule
 {
 public:

+    wxURLModule();
+

     virtual bool OnInit();
     virtual void OnExit();
 
     virtual bool OnInit();
     virtual void OnExit();
 


@@ -415,6 +422,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 

+wxURLModule::wxURLModule()
+{
+    // we must be cleaned up before wxSocketModule as otherwise deleting
+    // ms_proxyDefault from our OnExit() won't work (and can actually crash)
+    AddDependency(wxClassInfo::FindClass(wxT("wxSocketModule")));
+}
+

 bool wxURLModule::OnInit()
 {
 #if wxUSE_PROTOCOL_HTTP
 bool wxURLModule::OnInit()
 {
 #if wxUSE_PROTOCOL_HTTP


@@ -423,7 +437,7 @@ bool wxURLModule::OnInit()
     // down the program startup (especially if there is no DNS server
     // available, in which case it may take up to 1 minute)
 
     // down the program startup (especially if there is no DNS server
     // available, in which case it may take up to 1 minute)
 

-    if ( wxGetenv(_T("HTTP_PROXY")) )
+    if ( wxGetenv(wxT("HTTP_PROXY")) )

     {
         wxURL::ms_useDefaultProxy = true;
     }
     {
         wxURL::ms_useDefaultProxy = true;
     }


@@ -441,84 +455,5 @@ void wxURLModule::OnExit()
 
 #endif // wxUSE_SOCKETS
 
 
 #endif // wxUSE_SOCKETS
 

-// ---------------------------------------------------------------------------
-//
-//                        wxURL Compatibility
-//
-// ---------------------------------------------------------------------------
-
-#if WXWIN_COMPATIBILITY_2_4
-
-#include "wx/url.h"
-
-wxString wxURL::GetProtocolName() const
-{
-    return m_scheme;
-}
-
-wxString wxURL::GetHostName() const
-{
-    return m_server;
-}
-
-wxString wxURL::GetPath() const
-{
-    return m_path;
-}
-
-//Note that this old code really doesn't convert to a URI that well and looks
-//more like a dirty hack than anything else...
-
-wxString wxURL::ConvertToValidURI(const wxString& uri, const wxChar* delims)
-{
-  wxString out_str;
-  wxString hexa_code;
-  size_t i;
-
-  for (i = 0; i < uri.Len(); i++)
-  {
-    wxChar c = uri.GetChar(i);
-
-    if (c == wxT(' '))
-    {
-      // GRG, Apr/2000: changed to "%20" instead of '+'
-
-      out_str += wxT("%20");
-    }
-    else
-    {
-      // GRG, Apr/2000: modified according to the URI definition (RFC 2396)
-      //
-      // - Alphanumeric characters are never escaped
-      // - Unreserved marks are never escaped
-      // - Delimiters must be escaped if they appear within a component
-      //     but not if they are used to separate components. Here we have
-      //     no clear way to distinguish between these two cases, so they
-      //     are escaped unless they are passed in the 'delims' parameter
-      //     (allowed delimiters).
-
-      static const wxChar marks[] = wxT("-_.!~*()'");
-
-      if ( !wxIsalnum(c) && !wxStrchr(marks, c) && !wxStrchr(delims, c) )
-      {
-        hexa_code.Printf(wxT("%%%02X"), c);
-        out_str += hexa_code;
-      }
-      else
-      {
-        out_str += c;
-      }
-    }
-  }
-
-  return out_str;
-}
-
-wxString wxURL::ConvertFromURI(const wxString& uri)
-{
-    return wxURI::Unescape(uri);
-}
-
-#endif //WXWIN_COMPATIBILITY_2_4

 
 #endif // wxUSE_URL
 
 #endif // wxUSE_URL