Updated to Scintilla 1.67

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

diff --git a/src/msw/urlmsw.cpp b/src/msw/urlmsw.cpp
index 404da29892bc81c58229aa0691801ca49d270051..79b0ae8919fc7270c701e10f75329c56d57f4528 100644 (file)
--- 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:
 // 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
 #if wxUSE_URL_NATIVE
 
 #if !wxUSE_PROTOCOL_HTTP

-#include <wx/protocol/protocol.h>
+#include "wx/protocol/protocol.h"

 
 // empty http protocol replacement (for now)
 // so that wxUSE_URL_NATIVE can be used with
 
 // empty http protocol replacement (for now)
 // so that wxUSE_URL_NATIVE can be used with


@@ -31,7 +31,7 @@ public:
 
     wxProtocolError GetError() { return m_error; }
 
 
     wxProtocolError GetError() { return m_error; }
 

-    virtual bool Abort() { return TRUE; }
+    virtual bool Abort() { return true; }

 
     wxInputStream *GetInputStream(const wxString& WXUNUSED(path))
     {
 
     wxInputStream *GetInputStream(const wxString& WXUNUSED(path))
     {


@@ -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)
 // 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
 USE_PROTOCOL(wxHTTPDummyProto)
 
 #endif // !wxUSE_PROTOCOL_HTTP


@@ -122,9 +122,9 @@ public:
 
     void Attach(HINTERNET hFile);
 
 
     void Attach(HINTERNET hFile);
 

-    off_t SeekI( off_t WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )
+    wxFileOffset SeekI( wxFileOffset WXUNUSED(pos), wxSeekMode WXUNUSED(mode) )

         { return -1; }
         { return -1; }

-    off_t TellI() const
+    wxFileOffset TellI() const

         { return -1; }
 
 protected:
         { return -1; }
 
 protected:


@@ -199,11 +199,11 @@ wxURLNativeImp *wxURL::CreateNativeImpObject()
 wxInputStream *wxWinINetURL::GetInputStream(wxURL *owner)
 {
     DWORD service;
 wxInputStream *wxWinINetURL::GetInputStream(wxURL *owner)
 {
     DWORD service;

-    if ( owner->GetProtocolName() == wxT("http") )
+    if ( owner->GetScheme() == wxT("http") )

     {
         service = INTERNET_SERVICE_HTTP;
     }
     {
         service = INTERNET_SERVICE_HTTP;
     }

-    else if ( owner->GetProtocolName() == wxT("ftp") )
+    else if ( owner->GetScheme() == wxT("ftp") )

     {
         service = INTERNET_SERVICE_FTP;
     }
     {
         service = INTERNET_SERVICE_FTP;
     }


@@ -230,4 +230,3 @@ wxInputStream *wxWinINetURL::GetInputStream(wxURL *owner)
 }
 
 #endif // wxUSE_URL_NATIVE
 }
 
 #endif // wxUSE_URL_NATIVE

-