html filters has const methods now

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

diff --git a/src/html/htmlhelp.cpp b/src/html/htmlhelp.cpp
index 22d69b06cdd35610da286b25acf0b0f940a56d4d..a208ea5caf064bc7007ddce0d83d2d534bf7182d 100644 (file)
--- a/src/html/htmlhelp.cpp
+++ b/src/html/htmlhelp.cpp
@@ -219,7 +219,7 @@ static int IndexCompareFunc(const void *a, const void *b)
 
 
 
-bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg = FALSE)
+bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 {
     wxFSFile *fi;
     wxFileSystem fsys;
@@ -243,7 +243,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg = FA
     if (fi == NULL) return FALSE;
     fsys.ChangePathTo(bookFull);
     s = fi -> GetStream();
-    sz = s -> StreamSize();
+    sz = s -> GetSize();
     buff = (char*) malloc(sz+1);
     buff[sz] = 0;
     s -> Read(buff, sz);
@@ -532,7 +532,9 @@ void wxHtmlHelpController::CreateHelpWindow()
         return;
     }
 
+#if wxUSE_BUSYINFO
     wxBusyInfo busyinfo(_("Preparing help window..."));
+#endif
 
     if (m_Config) ReadCustomization(m_Config, m_ConfigRoot);
 
@@ -722,7 +724,7 @@ void wxHtmlHelpController::ReadCustomization(wxConfigBase *cfg, wxString path)
         cfg -> SetPath(path);
     }
 
-    m_Cfg.navig_on = (bool) cfg -> Read("hcNavigPanel", m_Cfg.navig_on);
+    m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
     m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
     m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
     m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);