Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/common/sckfile.cpp b/src/common/sckfile.cpp
index 152a91f89f2d921880948115acd071acc8f04be1..4b7b6cee1cfb0a93aaf6cae4cf0b60326eb3c9a6 100644 (file)
--- a/src/common/sckfile.cpp
+++ b/src/common/sckfile.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/97
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/97

-// RCS-ID:      $Id$

 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -25,13 +24,17 @@
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 
 #include "wx/wfstream.h"
 #include "wx/protocol/file.h"
 

+
+// ----------------------------------------------------------------------------
+// wxFileProto
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
 
 wxFileProto::wxFileProto()
            : wxProtocol()
 {
 IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
 IMPLEMENT_PROTOCOL(wxFileProto, wxT("file"), NULL, false)
 
 wxFileProto::wxFileProto()
            : wxProtocol()
 {

-    m_error = wxPROTO_NOERR;

 }
 
 wxFileProto::~wxFileProto()
 }
 
 wxFileProto::~wxFileProto()


@@ -41,14 +44,13 @@ wxFileProto::~wxFileProto()
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
     wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));
 wxInputStream *wxFileProto::GetInputStream(const wxString& path)
 {
     wxFileInputStream *retval = new wxFileInputStream(wxURI::Unescape(path));

-    if ( retval->Ok() )
+    if ( retval->IsOk() )

     {
     {

-        m_error = wxPROTO_NOERR;
-
+        m_lastError = wxPROTO_NOERR;

         return retval;
     }
 
         return retval;
     }
 

-    m_error = wxPROTO_NOFILE;
+    m_lastError = wxPROTO_NOFILE;

     delete retval;
 
     return NULL;
     delete retval;
 
     return NULL;