Do not incorrectly interprete StringToValue() returning false to mean that it failed

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

diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 8c7253e8b666daeb0bc96bb958b1161a35a733ea..b6e8362c852c0a3161daf1bd8eecf8de41c38c0c 100644 (file)
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -80,14 +80,14 @@ wxString wxTextBuffer::Translate(const wxString& text, wxTextFileType type)
     wxString eol = GetEOL(type), result;
 
     // optimization: we know that the length of the new string will be about
     wxString eol = GetEOL(type), result;
 
     // optimization: we know that the length of the new string will be about

-    // the same as the length of the old one, so prealloc memory to aviod
+    // the same as the length of the old one, so prealloc memory to avoid

     // unnecessary relocations
     result.Alloc(text.Len());
 
     wxChar chLast = 0;
     // unnecessary relocations
     result.Alloc(text.Len());
 
     wxChar chLast = 0;

-    for ( const wxChar *pc = text.c_str(); *pc; pc++ )
+    for ( wxString::const_iterator i = text.begin(); i != text.end(); ++i )

     {
     {

-        wxChar ch = *pc;
+        wxChar ch = *i;

         switch ( ch ) {
             case _T('\n'):
                 // Dos/Unix line termination
         switch ( ch ) {
             case _T('\n'):
                 // Dos/Unix line termination


@@ -226,7 +226,7 @@ wxTextFileType wxTextBuffer::GuessType() const
             case wxTextFileType_Unix: nUnix++; break;   \
             case wxTextFileType_Dos:  nDos++;  break;   \
             case wxTextFileType_Mac:  nMac++;  break;   \
             case wxTextFileType_Unix: nUnix++; break;   \
             case wxTextFileType_Dos:  nDos++;  break;   \
             case wxTextFileType_Mac:  nMac++;  break;   \

-            default: wxFAIL_MSG(_("unknown line terminator")); \
+            default: wxFAIL_MSG(_T("unknown line terminator")); \

         }
 
     size_t n;
         }
 
     size_t n;