[ 1563875 ] wxTreeCtrl::FindItem asserts when item not found

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

diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index 70c48e269483f022850f3b6e23262f85bcfea473..1a58175c2df9a4b9c53977d8c61155543d1a06e7 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,7 +10,7 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_LIBMSPACK
 #endif
 
 #if wxUSE_LIBMSPACK


@@ -18,11 +18,11 @@
 #include <mspack.h>
 
 #ifndef WXPRECOMP
 #include <mspack.h>
 
 #ifndef WXPRECOMP

-#include "wx/intl.h"
-#include "wx/log.h"
+    #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"


@@ -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; }


@@ -637,7 +637,7 @@ wxChmInputStream::CreateHHPStream()
                         wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
                         wxString msg ;
                         msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
                         wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
                         wxString msg ;
                         msg.Printf(_T("Language=0x%X\r\n"),lcid) ;

-                        out->Write(msg.c_str() , msg.Length() ) ;
+                        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();


@@ -743,7 +743,7 @@ 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);
 
     /// Is able to open location?
     virtual bool CanOpen(const wxString& location);