minor fixes; replace references to Windows95 with references to wxMSW where possible

[wxWidgets.git] / src / html / chm.cpp

diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index c2ba664e273e0776272d5ab144fb96018279c60a..288305d60600e73ce2120ebdee455f30f106804d 100644 (file)
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        chm.cpp
+// Name:        src/html/chm.cpp

 // Purpose:     CHM (Help) support for wxHTML
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development
 // Purpose:     CHM (Help) support for wxHTML
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development


@@ -10,19 +10,19 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LIBMSPACK
 
 #include <mspack.h>
 
 #endif
 
 #if wxUSE_LIBMSPACK
 
 #include <mspack.h>
 

-#ifndef WXPRECOMP
-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/filesys.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"
 #include "wx/filesys.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"


@@ -70,7 +70,7 @@ public:
     /// check archive for a file
     bool Contains(const wxString& pattern);
 
     /// check archive for a file
     bool Contains(const wxString& pattern);
 

-    /// get a string for the last error occured
+    /// get a string for the last error which occurred

     const wxString GetLastErrorMessage();
 
     /// Last Error
     const wxString GetLastErrorMessage();
 
     /// Last Error


@@ -364,7 +364,7 @@ public:
     wxChmInputStream(const wxString& archive,
                      const wxString& file, bool simulate = false);
     /// Destructor
     wxChmInputStream(const wxString& archive,
                      const wxString& file, bool simulate = false);
     /// Destructor

-    ~wxChmInputStream();
+    virtual ~wxChmInputStream();

 
     /// Return the size of the accessed file in archive
     virtual size_t GetSize() const { return m_size; }
 
     /// Return the size of the accessed file in archive
     virtual size_t GetSize() const { return m_size; }


@@ -414,7 +414,7 @@ private:
  *                 be local file accesible via fopen, fread functions!
  * @param filename The Name of the file to be extracted from archive
  * @param simulate if true than class should simulate .HHP-File based on #SYSTEM
  *                 be local file accesible via fopen, fread functions!
  * @param filename The Name of the file to be extracted from archive
  * @param simulate if true than class should simulate .HHP-File based on #SYSTEM

- *                 if false than class does nothing if it doesnt find .hhp
+ *                 if false than class does nothing if it doesn't find .hhp

  */
 wxChmInputStream::wxChmInputStream(const wxString& archive,
                                    const wxString& filename, bool simulate)
  */
 wxChmInputStream::wxChmInputStream(const wxString& archive,
                                    const wxString& filename, bool simulate)


@@ -541,7 +541,7 @@ wxFileOffset wxChmInputStream::OnSysSeek(wxFileOffset seek, wxSeekMode mode)
 /**
  * Help Browser tries to read the contents of the
  * file by interpreting a .hhp file in the Archiv.
 /**
  * Help Browser tries to read the contents of the
  * file by interpreting a .hhp file in the Archiv.

- * For .chm doesnt include such a file, we need
+ * For .chm doesn't include such a file, we need

  * to rebuild the information based on stored
  * system-files.
  */
  * to rebuild the information based on stored
  * system-files.
  */


@@ -561,7 +561,7 @@ wxChmInputStream::CreateHHPStream()
     if ( ! m_chm->Contains(_T("/#SYSTEM")) )
     {
 #ifdef DEBUG
     if ( ! m_chm->Contains(_T("/#SYSTEM")) )
     {
 #ifdef DEBUG

-        wxLogDebug(_("Archive doesnt contain #SYSTEM file"));
+        wxLogDebug("Archive doesn't contain #SYSTEM file");

 #endif
         return;
     }
 #endif
         return;
     }


@@ -636,8 +636,8 @@ wxChmInputStream::CreateHHPStream()
                         wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
                         wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
                         wxString msg ;
                         wxUint32 dummy = *((wxUint32 *)(structptr+0)) ;
                         wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
                         wxString msg ;

-                        msg.Printf("Language=0x%X\r\n",lcid) ;
-                        out->Write(msg.c_str() , msg.Length() ) ;
+                        msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
+                        out->Write(msg.c_str() , msg.length() ) ;

                     }
                     break ;
                 default:
                     }
                     break ;
                 default:


@@ -673,7 +673,7 @@ wxChmInputStream::CreateHHPStream()
             tmp = "Index File=*.hhk\r\n";
             out->Write((const void *) tmp, strlen(tmp));
         }
             tmp = "Index File=*.hhk\r\n";
             out->Write((const void *) tmp, strlen(tmp));
         }

-        
+

         // Now copy the Data from the memory
         out->SeekO(0, wxFromEnd);
         m_size = out->TellO();
         // Now copy the Data from the memory
         out->SeekO(0, wxFromEnd);
         m_size = out->TellO();


@@ -696,7 +696,7 @@ wxChmInputStream::CreateHHPStream()
 bool wxChmInputStream::CreateFileStream(const wxString& pattern)
 {
     wxFileInputStream * fin;
 bool wxChmInputStream::CreateFileStream(const wxString& pattern)
 {
     wxFileInputStream * fin;

-    wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"), NULL);
+    wxString tmpfile = wxFileName::CreateTempFileName(_T("chmstrm"));

 
     if ( tmpfile.empty() )
     {
 
     if ( tmpfile.empty() )
     {


@@ -743,15 +743,15 @@ class wxChmFSHandler : public wxFileSystemHandler
 public:
     /// Constructor and Destructor
     wxChmFSHandler();
 public:
     /// Constructor and Destructor
     wxChmFSHandler();

-    ~wxChmFSHandler();
+    virtual ~wxChmFSHandler();

 
     /// Is able to open location?
     virtual bool CanOpen(const wxString& location);
     /// Open a file
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
 
     /// Is able to open location?
     virtual bool CanOpen(const wxString& location);
     /// Open a file
     virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);

-    /// Find first occurence of spec
+    /// Find first occurrence of spec

     virtual wxString FindFirst(const wxString& spec, int flags = 0);
     virtual wxString FindFirst(const wxString& spec, int flags = 0);

-    /// Find next occurence of spec
+    /// Find next occurrence of spec

     virtual wxString FindNext();
 
 private:
     virtual wxString FindNext();
 
 private:


@@ -825,13 +825,11 @@ wxFSFile* wxChmFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs),
     // Open a stream to read the content of the chm-file
     s = new wxChmInputStream(leftFilename.GetFullPath(), right, true);
 
     // Open a stream to read the content of the chm-file
     s = new wxChmInputStream(leftFilename.GetFullPath(), right, true);
 

-    wxString mime = GetMimeTypeFromExt(location);
-

     if ( s )
     {
         return new wxFSFile(s,
                             left + _T("#chm:") + right,
     if ( s )
     {
         return new wxFSFile(s,
                             left + _T("#chm:") + right,

-                            mime,
+                            wxEmptyString,

                             GetAnchor(location),
                             wxDateTime(wxFileModificationTime(left)));
     }
                             GetAnchor(location),
                             wxDateTime(wxFileModificationTime(left)));
     }