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

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index d3f951a88d876c4ec39a45d3ff5d67e491192bc7..28c3de9e68acc0d0ac045b9515b26a5173dc6f2a 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxHtmlFilter - input filter for translating into HTML format
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtmlFilter - input filter for translating into HTML format
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -9,50 +9,29 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP

     #include "wx/log.h"
     #include "wx/intl.h"
 #endif
 
 #include "wx/strconv.h"
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif
 
 #include "wx/strconv.h"

+#include "wx/sstream.h"

 #include "wx/html/htmlfilt.h"
 #include "wx/html/htmlwin.h"
 
 #include "wx/html/htmlfilt.h"
 #include "wx/html/htmlwin.h"
 

-// utility function: read a wxString from a wxInputStream
+// utility function: read entire contents of an wxInputStream into a wxString
+//
+// TODO: error handling?

 static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv)
 {
 static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv)
 {

-    size_t streamSize = s->GetSize();
-
-    if (streamSize == ~(size_t)0)
-    {
-        const size_t bufSize = 4095;
-        char buffer[bufSize+1];
-        size_t lastRead;
-
-        do
-        {
-            s->Read(buffer, bufSize);
-            lastRead = s->LastRead();
-            buffer[lastRead] = 0;
-            str.Append(wxString(buffer, conv));
-        }
-        while (lastRead == bufSize);
-    }
-    else
-    {
-        char* src = new char[streamSize+1];
-        s->Read(src, streamSize);
-        src[streamSize] = 0;
-        str = wxString(src, conv);
-        delete[] src;
-    }
+    wxStringOutputStream out(&str, conv);
+    s->Read(out);

 }
 
 /*
 }
 
 /*