fixes for page positioning for notebooks with wxNB_MULTILINE style (closes bugs 70909...

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

diff --git a/src/common/url.cpp b/src/common/url.cpp
index e265e0c5f3c729019b71647eeb7a6435cac11578..6c0da6ee2921fbbee52720e73a2ff240b7b36b68 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -61,6 +61,9 @@ wxURL::wxURL(const wxString& url)
     m_protocol = NULL;
     m_error = wxURL_NOERR;
     m_url = url;
     m_protocol = NULL;
     m_error = wxURL_NOERR;
     m_url = url;

+#if wxUSE_URL_NATIVE
+    m_nativeImp = CreateNativeImpObject();
+#endif

 
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )
 
 #if wxUSE_SOCKETS
     if ( ms_useDefaultProxy && !ms_proxyDefault )


@@ -157,10 +160,13 @@ void wxURL::CleanData()
 
 wxURL::~wxURL()
 {
 
 wxURL::~wxURL()
 {

-  CleanData();
+    CleanData();

 #if wxUSE_SOCKETS
 #if wxUSE_SOCKETS

-  if (m_proxy && m_proxy != ms_proxyDefault)
-    delete m_proxy;
+    if (m_proxy && m_proxy != ms_proxyDefault)
+        delete m_proxy;
+#endif
+#if wxUSE_URL_NATIVE
+    delete m_nativeImp;

 #endif
 }
 
 #endif
 }
 


@@ -285,6 +291,19 @@ wxInputStream *wxURL::GetInputStream()
     m_protocol->SetPassword(m_password);
   }
 
     m_protocol->SetPassword(m_password);
   }
 

+#if wxUSE_URL_NATIVE
+  // give the native implementation to return a better stream
+  // such as the native WinINet functionality under MS-Windows
+  if (m_nativeImp)
+  {
+    wxInputStream *rc;
+    rc = m_nativeImp->GetInputStream(this);
+    if (rc != 0)
+        return rc;
+  }
+  // else use the standard behaviour
+#endif // wxUSE_URL_NATIVE
+

 #if wxUSE_SOCKETS
     wxIPV4address addr;
 
 #if wxUSE_SOCKETS
     wxIPV4address addr;