Forgot the appropriate return statement for the last patch.

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

diff --git a/src/html/chm.cpp b/src/html/chm.cpp
index bdba0005b25d616f307bc889e76996991c982eb4..627b039f335ffca83c7fc772d1a95a0655267d57 100644 (file)
--- a/src/html/chm.cpp
+++ b/src/html/chm.cpp
@@ -4,7 +4,7 @@
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development
 // CVS-ID:      $Id$
 // Author:      Markus Sinner
 // Copyright:   (c) 2003 Herd Software Development
 // CVS-ID:      $Id$

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -122,7 +122,7 @@ wxChmTools::wxChmTools(const wxFileName &archive)
     //     strdup() [libmspack-20030726], which would cause crashes in
     //     Unicode build when mb_str() returns temporary buffer
     m_chmFileNameANSI = strdup((const char*)m_chmFileName.mb_str(wxConvFile));
     //     strdup() [libmspack-20030726], which would cause crashes in
     //     Unicode build when mb_str() returns temporary buffer
     m_chmFileNameANSI = strdup((const char*)m_chmFileName.mb_str(wxConvFile));

-    
+

     // Open the archive and store it in class:
     if ( (chmh = chmd->open(chmd, (char*)m_chmFileNameANSI)) )
     {
     // Open the archive and store it in class:
     if ( (chmh = chmd->open(chmd, (char*)m_chmFileNameANSI)) )
     {


@@ -204,7 +204,7 @@ bool wxChmTools::Contains(const wxString& pattern)
  *
  * Finds the next file descibed by a pattern in the archive, starting
  * the file given by second parameter
  *
  * Finds the next file descibed by a pattern in the archive, starting
  * the file given by second parameter

- * 
+ *

  * @param pattern   The file-pattern to search for. May contain '*' and/or '?'
  * @param startfrom The filename which the search should start after
  * @returns         The full pathname of the found file
  * @param pattern   The file-pattern to search for. May contain '*' and/or '?'
  * @param startfrom The filename which the search should start after
  * @returns         The full pathname of the found file


@@ -557,11 +557,11 @@ wxChmInputStream::CreateHHPStream()
     const char *tmp;
 
     // Try to open the #SYSTEM-File and create the HHP File out of it
     const char *tmp;
 
     // Try to open the #SYSTEM-File and create the HHP File out of it

-    // see http://bonedaddy.net/pabs3/chmspec/0.1/ch05s03.html#SYSTEM
-    if ( ! m_chm->Contains(_("/#SYSTEM")) )
+    // see http://bonedaddy.net/pabs3/chmspec/0.1.2/Internal.html#SYSTEM
+    if ( ! m_chm->Contains(_T("/#SYSTEM")) )

     {
 #ifdef DEBUG
     {
 #ifdef DEBUG

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

 #endif
         return;
     }
 #endif
         return;
     }