no message

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

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index 3f56c0f6fcd1cd33de2f41fd65612cd902260818..cf3095cd5e18b6ad32dfaea71d9f0c401868a9a2 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -39,11 +39,11 @@
 
 // default type is the native one
 const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
 
 // default type is the native one
 const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::

-#if   defined(__WXMSW__)
+#if   defined(__WINDOWS__)

   Type_Dos;
 #elif defined(__UNIX__)
   Type_Unix;
   Type_Dos;
 #elif defined(__UNIX__)
   Type_Unix;

-#elif defined(__MAC__)
+#elif defined(__WXMAC__)

   Type_Mac;
   // if you feel brave, remove the next line
   #error  "wxTextFile: code for Mac files is untested."
   Type_Mac;
   // if you feel brave, remove the next line
   #error  "wxTextFile: code for Mac files is untested."


@@ -101,13 +101,13 @@ wxTextFile::Type wxTextFile::GuessType() const
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
 
   // scan the file lines
   wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 );
 
   // scan the file lines

-  uint nUnix = 0,     // number of '\n's alone
+  size_t nUnix = 0,     // number of '\n's alone

        nDos  = 0,     // number of '\r\n'
        nMac  = 0;     // number of '\r's
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)
        nDos  = 0,     // number of '\r\n'
        nMac  = 0;     // number of '\r's
 
   // we take MAX_LINES_SCAN in the beginning, middle and the end of file
   #define MAX_LINES_SCAN    (10)

-  uint nCount = m_aLines.Count() / 3,
+  size_t nCount = m_aLines.Count() / 3,

        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
 
   #define   AnalyseLine(n)              \
        nScan =  nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3;
 
   #define   AnalyseLine(n)              \


@@ -115,10 +115,10 @@ wxTextFile::Type wxTextFile::GuessType() const
       case Type_Unix: nUnix++; break;   \
       case Type_Dos:  nDos++;  break;   \
       case Type_Mac:  nMac++;  break;   \
       case Type_Unix: nUnix++; break;   \
       case Type_Dos:  nDos++;  break;   \
       case Type_Mac:  nMac++;  break;   \

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

     }
 
     }
 

-  uint n;
+  size_t n;

   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
   for ( n = 0; n < nScan; n++ )     // the beginning
     AnalyseLine(n);
   for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )


@@ -131,7 +131,7 @@ wxTextFile::Type wxTextFile::GuessType() const
   // interpret the results (@@ far from being even 50% fool proof)
   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all
   // interpret the results (@@ far from being even 50% fool proof)
   if ( nDos + nUnix + nMac == 0 ) {
     // no newlines at all

-    wxLogWarning("'%s' is probably a binary file.", m_strFile.c_str());
+    wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());

   }
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \
   }
   else {
     #define   GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault               \


@@ -224,12 +224,12 @@ bool wxTextFile::Write(Type typeNew)
   wxTempFile fileTmp(m_strFile);
 
   if ( !fileTmp.IsOpened() ) {
   wxTempFile fileTmp(m_strFile);
 
   if ( !fileTmp.IsOpened() ) {

-    wxLogError("can't write file '%s' to disk.", m_strFile.c_str());
+    wxLogError(_("can't write file '%s' to disk."), m_strFile.c_str());

     return FALSE;
   }
 
     return FALSE;
   }
 

-  uint nCount = m_aLines.Count();
-  for ( uint n = 0; n < nCount; n++ ) {
+  size_t nCount = m_aLines.Count();
+  for ( size_t n = 0; n < nCount; n++ ) {

     fileTmp.Write(m_aLines[n] +
                   GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
   }
     fileTmp.Write(m_aLines[n] +
                   GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew));
   }