wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 36fab028f4c0194b764bb89ecb99c21fb6966878..5c53b1f162c76576f5ab1d769cd7ac8b11c0630c 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -70,14 +70,14 @@ wxChar wxTextInputStream::NextChar()
 #if wxUSE_UNICODE
     wxChar wbuf[2];
     memset((void*)m_lastBytes, 0, 10);
 #if wxUSE_UNICODE
     wxChar wbuf[2];
     memset((void*)m_lastBytes, 0, 10);

-    for(size_t inlen = 0; inlen < 9; inlen++) 
+    for(size_t inlen = 0; inlen < 9; inlen++)

     {
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 
     {
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 

-        if(m_input.LastRead() <= 0) 
+        if(m_input.LastRead() <= 0)

             return wxEOT;
             return wxEOT;

-        
+

         int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
         if(retlen >= 0) // res == 0 could happen for '\0' char
             return wbuf[0];
         int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
         if(retlen >= 0) // res == 0 could happen for '\0' char
             return wbuf[0];


@@ -86,21 +86,20 @@ wxChar wxTextInputStream::NextChar()
     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();
     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();

-    
-    if(m_input.LastRead() <= 0) 
+
+    if(m_input.LastRead() <= 0)

         return wxEOT;
         return wxEOT;

-    
+

     return m_lastBytes[0];
 #endif
     return m_lastBytes[0];
 #endif

-    
+

 }
 
 wxChar wxTextInputStream::NextNonSeparators()
 {
 }
 
 wxChar wxTextInputStream::NextNonSeparators()
 {

-    wxChar c = (wxChar) 0;

     for (;;)
     {
     for (;;)
     {

-        c = NextChar();
+        wxChar c = NextChar();

         if (c == wxEOT) return (wxChar) 0;
 
         if (c != wxT('\n') &&
         if (c == wxEOT) return (wxChar) 0;
 
         if (c != wxT('\n') &&


@@ -113,18 +112,18 @@ wxChar wxTextInputStream::NextNonSeparators()
 
 bool wxTextInputStream::EatEOL(const wxChar &c)
 {
 
 bool wxTextInputStream::EatEOL(const wxChar &c)
 {

-    if (c == wxT('\n')) return TRUE; // eat on UNIX
+    if (c == wxT('\n')) return true; // eat on UNIX

 
     if (c == wxT('\r')) // eat on both Mac and DOS
     {
         wxChar c2 = NextChar();
 
     if (c == wxT('\r')) // eat on both Mac and DOS
     {
         wxChar c2 = NextChar();

-        if(c2 == wxEOT) return TRUE; // end of stream reached, had enough :-)
+        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)

 
         if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
 
         if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 wxUint32 wxTextInputStream::Read32(int base)
 }
 
 wxUint32 wxTextInputStream::Read32(int base)


@@ -192,7 +191,7 @@ wxString wxTextInputStream::ReadLine()
         wxChar c = NextChar();
         if(c == wxEOT)
             break;
         wxChar c = NextChar();
         if(c == wxEOT)
             break;

-        
+

         if ( !m_input )
             break;
 
         if ( !m_input )
             break;
 


@@ -217,13 +216,13 @@ wxString wxTextInputStream::ReadWord()
         return word;
 
     word += c;
         return word;
 
     word += c;

-    
+

     while ( !m_input.Eof() )
     {
         c = NextChar();
         if(c == wxEOT)
             break;
     while ( !m_input.Eof() )
     {
         c = NextChar();
         if(c == wxEOT)
             break;

-            
+

         if (m_separators.Contains(c))
             break;
 
         if (m_separators.Contains(c))
             break;
 


@@ -422,10 +421,21 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
     WriteString( wxString::FromAscii(c) );
 wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
     WriteString( wxString::FromAscii(c) );

-    
+
+    return *this;
+}
+
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
+{
+    WriteString( wxString(&wc, m_conv, 1) );
+

     return *this;
 }
 
     return *this;
 }
 

+#endif // wxUSE_UNICODE
+

 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
     wxString str;
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
     wxString str;