Fixes for 16-bit compilation

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index e4d260bcf19c43cf444c16dae43f45bdd6ee4661..2dfa95ff8f489b3b5dacf337ef2fbdf212dda230 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     28/06/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux 
+// Copyright:   (c) Guilhem Lavaux
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -55,36 +55,36 @@ wxChar wxTextInputStream::NextNonWhiteSpace()
         c = m_input->GetC();
        if (!m_input) return (wxChar) 0;
        
-       if (c != _T('\n') && 
-           c != _T('\r') &&
-           c != _T('\t') &&
-           c != _T(' '))
+       if (c != wxT('\n') &&
+           c != wxT('\r') &&
+           c != wxT('\t') &&
+           c != wxT(' '))
        {
            return c;
        }
     }
-    
+
     // this shouldn't happen
     return (wxChar) 0;
 }
 
 void wxTextInputStream::SkipIfEndOfLine( wxChar c )
 {
-    if (c == _T('\n'))
-    { 
+    if (c == wxT('\n'))
+    {
         // eat on UNIX
        return;
     }
-    
-    if (c == _T('\r'))
+
+    if (c == wxT('\r'))
     {
         // eat on both Mac and DOS
        
         wxChar c2 = m_input->GetC();
         if (!m_input) return;
        
-        if (c2 == _T('\n'))
-        {  
+        if (c2 == wxT('\n'))
+        {
            // eat on DOS
            return;
        }
@@ -106,34 +106,34 @@ wxUint32 wxTextInputStream::Read32()
     /* I only implemented a simple integer parser */
     int sign;
     wxInt32 i;
-    
+
     int c = NextNonWhiteSpace();
     if (!m_input) return 0;
 
     i = 0;
-    if (! (c == _T('-') || c == _T('+') || isdigit(c)) ) 
+    if (! (c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
         m_input->Ungetch(c);
         return 0;
     }
 
-    if (c == _T('-')) 
+    if (c == wxT('-'))
     {
         sign = -1;
         c = m_input->GetC();
-    } else 
-    if (c == _T('+')) 
+    } else
+    if (c == wxT('+'))
     {
         sign = 1;
         c = m_input->GetC();
-    } else 
+    } else
     {
         sign = 1;
     }
 
-    while (isdigit(c)) 
+    while (isdigit(c))
     {
-        i = i*10 + (c - (int)_T('0'));
+        i = i*10 + (c - (int)wxT('0'));
         c = m_input->GetC();
     }
 
@@ -164,64 +164,64 @@ double wxTextInputStream::ReadDouble()
     if (!m_input) return 0.0;
 
     f = 0.0;
-    if (! (c == _T('.') || c == _T('-') || c == _T('+') || isdigit(c)) ) 
+    if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
         m_input->Ungetch(c);
         return 0.0;
     }
 
-    if (c == _T('-')) 
+    if (c == wxT('-'))
     {
         sign = -1;
         c = m_input->GetC();
-    } else 
-    if (c == _T('+')) 
+    } else
+    if (c == wxT('+'))
     {
         sign = 1;
         c = m_input->GetC();
-    } 
-    else 
+    }
+    else
     {
         sign = 1;
     }
 
-    while (isdigit(c)) 
+    while (isdigit(c))
     {
-        f = f*10 + (c - _T('0'));
+        f = f*10 + (c - wxT('0'));
         c = m_input->GetC();
     }
 
-    if (c == _T('.')) 
+    if (c == wxT('.'))
     {
         double f_multiplicator = (double) 0.1;
 
         c = m_input->GetC();
 
-        while (isdigit(c)) 
+        while (isdigit(c))
        {
-            f += (c-_T('0'))*f_multiplicator;
+            f += (c-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;
             c = m_input->GetC();
         }
 
-        if (c == _T('e')) 
+        if (c == wxT('e'))
        {
             double f_multiplicator = 0.0;
             int i, e;
 
             c = m_input->GetC();
 
-            switch (c) 
+            switch (c)
            {
-                case _T('-'): f_multiplicator = 0.1;  break;
-               case _T('+'): f_multiplicator = 10.0; break;
+                case wxT('-'): f_multiplicator = 0.1;  break;
+               case wxT('+'): f_multiplicator = 10.0; break;
            }
 
             e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
-        } 
+        }
        else
            SkipIfEndOfLine( c );
     }
@@ -240,26 +240,26 @@ wxString wxTextInputStream::ReadString()
     wxChar c;
     wxString line;
 
-    for (;;) 
+    for (;;)
     {
         c = m_input->GetC();
         if (!m_input) break;
        
-        if (c == _T('\n'))
+        if (c == wxT('\n'))
         {
            // eat on UNIX
            break;
        }
        
-        if (c == _T('\r'))
+        if (c == wxT('\r'))
         {
             // eat on both Mac and DOS
-           
+       
             wxChar c2 = m_input->GetC();
            if (!m_input) break;
-           
-           if (c2 == _T('\n'))
-            {  
+       
+           if (c2 == wxT('\n'))
+            {
                // eat on DOS
                break;
            }
@@ -273,10 +273,10 @@ wxString wxTextInputStream::ReadString()
        
         line += c;
     }
-    
+
     return line;
 }
-  
+
 wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
 {
   line = ReadString();
@@ -291,14 +291,14 @@ wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
         c = (wxChar) 0;
         return *this;
     }
-    
-    if (c1 == _T('\r'))
+
+    if (c1 == wxT('\r'))
     {
-        c = _T('\n');
+        c = wxT('\n');
         wxChar c2 = m_input->GetC();
        if (!m_input) return *this;
-           
-       if (c2 != _T('\n'))
+       
+       if (c2 != wxT('\n'))
        {
            // we are on a Mac
             m_input->Ungetch( c2 );
@@ -308,7 +308,7 @@ wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
     {
         c = c1;
     }
-    
+
     return *this;
 }
 
@@ -360,24 +360,24 @@ wxTextOutputStream::~wxTextOutputStream()
 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;
-    str.Printf(_T("%u"), i);
-    
+    str.Printf(wxT("%u"), i);
+
     WriteString(str);
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
-    str.Printf(_T("%u"), i);
-    
+    str.Printf(wxT("%u"), i);
+
     WriteString(str);
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
-    str.Printf(_T("%u"), i);
-    
+    str.Printf(wxT("%u"), i);
+
     WriteString(str);
 }
 
@@ -385,7 +385,7 @@ void wxTextOutputStream::WriteDouble(double d)
 {
     wxString str;
 
-    str.Printf(_T("%f"), d);
+    str.Printf(wxT("%f"), d);
     WriteString(str);
 }
 
@@ -394,18 +394,23 @@ void wxTextOutputStream::WriteString(const wxString& string)
     for (size_t i = 0; i < string.Len(); i++)
     {
         wxChar c = string[i];
-        if (c == _T('\n'))
+        if (c == wxT('\n'))
         {
 #if   defined(__WINDOWS__)
-            c = _T('\r');
+            c = wxT('\r');
             m_output->Write( (const void*)(&c), sizeof(wxChar) );
-            c = _T('\n');
+            c = wxT('\n');
             m_output->Write( (const void*)(&c), sizeof(wxChar) );
 #elif defined(__UNIX__)
-            c = _T('\n');
+            c = wxT('\n');
             m_output->Write( (const void*)(&c), sizeof(wxChar) );
 #elif defined(__WXMAC__)
-            c = _T('\r');
+            c = wxT('\r');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+#elif   defined(__OS2__)
+            c = wxT('\r');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            c = wxT('\n');
             m_output->Write( (const void*)(&c), sizeof(wxChar) );
 #else
             #error  "wxTextOutputStream: unsupported platform."
@@ -472,5 +477,10 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
     return *this;
 }
 
+wxTextOutputStream &endl( wxTextOutputStream &stream )
+{
+    return stream << wxT('\n');
+}
+
 #endif
   // wxUSE_STREAMS