wxHTML compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/html/htmlfilter.cpp

@@ -57,9 +57,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file)
     wxString doc, doc2;
 
     if (s == NULL) return wxEmptyString;
-    src = new char[s -> StreamSize()+1];
-    src[s -> StreamSize()] = 0;
-    s -> Read(src, s -> StreamSize());
+    src = new char[s -> GetSize()+1];
+    src[s -> GetSize()] = 0;
+    s -> Read(src, s -> GetSize());
     doc = src;
     delete [] src;
 
@@ -137,9 +137,9 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file)
     wxString doc;
 
     if (s == NULL) return wxEmptyString;
-    src = (char*) malloc(s -> StreamSize() + 1);
-    src[s -> StreamSize()] = 0;
-    s -> Read(src, s -> StreamSize());
+    src = (char*) malloc(s -> GetSize() + 1);
+    src[s -> GetSize()] = 0;
+    s -> Read(src, s -> GetSize());
     doc = src;
     free(src);
 

src/html/htmlhelp.cpp

@@ -243,7 +243,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
     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);
@@ -724,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);

src/html/htmlhelp_io.cpp

@@ -129,7 +129,7 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
 
     f = fsys.OpenFile(contentsfile);
     if (f) {
-        sz = f -> GetStream() -> StreamSize();
+        sz = f -> GetStream() -> GetSize();
         buf = (char*) malloc(sz+1);
         buf[sz] = 0;
         f -> GetStream() -> Read(buf, sz);
@@ -142,7 +142,7 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
 
     f = fsys.OpenFile(indexfile);
     if (f) {
-        sz = f -> GetStream() -> StreamSize();
+        sz = f -> GetStream() -> GetSize();
         buf = (char*) malloc(sz+1);
         buf[sz] = 0;
         f -> GetStream() -> Read(buf, sz);

src/html/search.cpp

@@ -50,7 +50,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
     wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!"));
 
     int i, j;
-    int lng = stream -> StreamSize();
+    int lng = stream ->GetSize();
     int wrd = strlen(m_Keyword);
     bool found = FALSE;
     char *buf = (char*) malloc(lng + 1);