use wx/dynlib.h and not wx/dynload.h (patch 1448691)

[wxWidgets.git] / src / common / textfile.cpp

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 440f4e8f627cc4559d86542083dc58373e98c7db..f9cd34077d22b650c94051aa1933a030f51822b1 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -116,6 +116,10 @@ bool wxTextFile::OnRead(wxMBConv& conv)
         if ( nRead == 0 )
             break;
 
         if ( nRead == 0 )
             break;
 

+        // save the number characters which we already processed during the
+        // last loop iteration
+        const size_t lenOld = str.length();
+

 #if wxUSE_UNICODE
         // we have to properly NUL-terminate the string for any encoding it may
         // use -- 4 NULs should be enough for everyone (this is why we add 4
 #if wxUSE_UNICODE
         // we have to properly NUL-terminate the string for any encoding it may
         // use -- 4 NULs should be enough for everyone (this is why we add 4


@@ -135,15 +139,16 @@ bool wxTextFile::OnRead(wxMBConv& conv)
 
         str += strbuf;
 #else // ANSI
 
         str += strbuf;
 #else // ANSI

+        wxUnusedVar(conv);

         buf[nRead] = '\0';
         str += buf;
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
 
         // the beginning of the current line, changes inside the loop
         buf[nRead] = '\0';
         str += buf;
 #endif // wxUSE_UNICODE/!wxUSE_UNICODE
 
 
         // the beginning of the current line, changes inside the loop

-        const wxChar *lineStart = str.begin();
-        const wxChar * const end = str.end();
-        for ( const wxChar *p = lineStart; p != end; p++ )
+        wxString::const_iterator lineStart = str.begin();
+        const wxString::const_iterator end = str.end();
+        for ( wxString::const_iterator p = lineStart + lenOld; p != end; p++ )

         {
             const wxChar ch = *p;
             switch ( ch )
         {
             const wxChar ch = *p;
             switch ( ch )