X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ec698211d5d82a009ac80fb354059e9af497508..949750de631b2c2ee59c6e9080e7d38fa66c0167:/src/msw/urlmsw.cpp diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp index 6df72c6583..e24bcbb90b 100644 --- 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 @@ -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; }