Back to previous call with -1 replacement.

[wxWidgets.git] / src / msw / urlmsw.cpp

diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 6df72c6583538924aa69fceadb504a49ad4dee26..e24bcbb90be9d6445e20161539152f7be5fa2d73 100644 (file)
--- a/src/msw/urlmsw.cpp
+++ b/src/msw/urlmsw.cpp
@@ -18,6 +18,13 @@
 
 #if wxUSE_URL_NATIVE
 
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
+#endif
+
 #if !wxUSE_PROTOCOL_HTTP
 #include "wx/protocol/protocol.h"
 
@@ -59,10 +66,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
     #pragma comment(lib, "wininet.lib")
 #endif
 
-#include "wx/string.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/module.h"
 #include "wx/url.h"
 
 #include <string.h>
@@ -118,7 +121,7 @@ class /*WXDLLIMPEXP_NET */ wxWinINetInputStream : public wxInputStream
 {
 public:
     wxWinINetInputStream(HINTERNET hFile=0);
-    ~wxWinINetInputStream();
+    virtual ~wxWinINetInputStream();
 
     void Attach(HINTERNET hFile);
 
@@ -199,11 +202,11 @@ wxURLNativeImp *wxURL::CreateNativeImpObject()
 wxInputStream *wxWinINetURL::GetInputStream(wxURL *owner)
 {
     DWORD service;
-    if ( owner->GetProtocolName() == wxT("http") )
+    if ( owner->GetScheme() == wxT("http") )
     {
         service = INTERNET_SERVICE_HTTP;
     }
-    else if ( owner->GetProtocolName() == wxT("ftp") )
+    else if ( owner->GetScheme() == wxT("ftp") )
     {
         service = INTERNET_SERVICE_FTP;
     }