X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30984deafc05d7c6f88db736336fe73d23a08e19..6945b5878c8d46a56f1a59f558837a0943492f3c:/src/msw/urlmsw.cpp diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp index 5b16115615..79b0ae8919 100644 --- a/src/msw/urlmsw.cpp +++ b/src/msw/urlmsw.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/urlmsw.cpp +// Name: src/msw/urlmsw.cpp // Purpose: MS-Windows native URL support based on WinINet // Author: Hajo Kirchhoff // Modified by: @@ -19,7 +19,7 @@ #if wxUSE_URL_NATIVE #if !wxUSE_PROTOCOL_HTTP -#include +#include "wx/protocol/protocol.h" // empty http protocol replacement (for now) // so that wxUSE_URL_NATIVE can be used with @@ -48,7 +48,7 @@ protected: // the only "reason for being" for this class is to tell // wxURL that there is someone dealing with the http protocol IMPLEMENT_DYNAMIC_CLASS(wxHTTPDummyProto, wxProtocol) -IMPLEMENT_PROTOCOL(wxHTTPDummyProto, wxT("http"), NULL, FALSE) +IMPLEMENT_PROTOCOL(wxHTTPDummyProto, wxT("http"), NULL, false) USE_PROTOCOL(wxHTTPDummyProto) #endif // !wxUSE_PROTOCOL_HTTP @@ -199,11 +199,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; } @@ -230,4 +230,3 @@ wxInputStream *wxWinINetURL::GetInputStream(wxURL *owner) } #endif // wxUSE_URL_NATIVE -