fixed wxTaskBarIcon compilation

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index ae71ae5d219da1a2b2176878960d80a921e7be0c..f90acd13fd2f7597ce79991d3d552afba6d75708 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -63,20 +63,20 @@ wxChar wxTextInputStream::NextNonSeparators()
 
 }
 
 
 }
 

-inline 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
+    if (c == wxT('\r')) // eat on both Mac and DOS

     {
     {

-      if (!m_input) return TRUE;
-      wxChar c2 = m_input.GetC();
+        if (!m_input) return TRUE;
+        wxChar c2 = m_input.GetC();

 
 

-      if (c2 != wxT('\n'))  m_input.Ungetch( c2 ); // Don't eat on Mac
-      return TRUE;
+        if (c2 != wxT('\n'))  m_input.Ungetch( c2 ); // Don't eat on Mac
+        return TRUE;

     }
 
     }
 

-  return FALSE;
+    return FALSE;

 }
 
 void wxTextInputStream::SkipIfEndOfLine( wxChar c )
 }
 
 void wxTextInputStream::SkipIfEndOfLine( wxChar c )


@@ -143,12 +143,16 @@ wxUint8 wxTextInputStream::Read8()
 
 double wxTextInputStream::ReadDouble()
 {
 
 double wxTextInputStream::ReadDouble()
 {

-    /* I only implemented a simple float parser */
-    // VZ: what about using strtod()?? (TODO)
+    /* I only implemented a simple float parser
+     * VZ: what about using strtod()?? (TODO)
+     */
+

     double f;
     double f;

-    int sign;
+    int theSign;
+
+    if (!m_input)
+        return 0;

 
 

-    if (!m_input) return 0;

     int c = NextNonSeparators();
     if (c==(wxChar)0) return 0;
 
     int c = NextNonSeparators();
     if (c==(wxChar)0) return 0;
 


@@ -156,22 +160,22 @@ double wxTextInputStream::ReadDouble()
     if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
         m_input.Ungetch(c);
     if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
     {
         m_input.Ungetch(c);

-        return 0.0;
+        return 0;

     }
 
     if (c == wxT('-'))
     {
     }
 
     if (c == wxT('-'))
     {

-        sign = -1;
+        theSign = -1;

         c = m_input.GetC();
     } else
     if (c == wxT('+'))
     {
         c = m_input.GetC();
     } else
     if (c == wxT('+'))
     {

-        sign = 1;
+        theSign = 1;

         c = m_input.GetC();
     }
     else
     {
         c = m_input.GetC();
     }
     else
     {

-        sign = 1;
+        theSign = 1;

     }
 
     while (isdigit(c))
     }
 
     while (isdigit(c))


@@ -219,8 +223,7 @@ double wxTextInputStream::ReadDouble()
         m_input.Ungetch(c);
     }
 
         m_input.Ungetch(c);
     }
 

-    f *= sign;
-
+    f *= theSign;

     return f;
 }
 
     return f;
 }
 


@@ -237,6 +240,7 @@ wxString wxTextInputStream::ReadLine()
     while ( !m_input.Eof() )
     {
         c = m_input.GetC();
     while ( !m_input.Eof() )
     {
         c = m_input.GetC();

+        

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


@@ -260,8 +264,15 @@ wxString wxTextInputStream::ReadWord()
     if ( !c )
         return word;
 
     if ( !c )
         return word;
 

+    word += c;
+    

     while ( !m_input.Eof() )
     {
     while ( !m_input.Eof() )
     {

+        c = m_input.GetC();
+        
+        if (!m_input)
+            break;
+            

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


@@ -269,10 +280,6 @@ wxString wxTextInputStream::ReadWord()
             break;
 
         word += c;
             break;
 
         word += c;

-
-        c = m_input.GetC();
-        if (!m_input)
-            break;

     }
 
     return word;
     }
 
     return word;


@@ -284,17 +291,19 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
     return *this;
 }
 
     return *this;
 }
 

-wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
+wxTextInputStream& wxTextInputStream::operator>>(char& c)

 {
     if (!m_input)
     {
 {
     if (!m_input)
     {

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

         return *this;
     }
 
     c = m_input.GetC();
 
         return *this;
     }
 
     c = m_input.GetC();
 

-    if (EatEOL(c)) c=wxT('\n');
+    if (EatEOL(c))
+        c = '\n';
+

     return *this;
 }
 
     return *this;
 }
 


@@ -342,7 +351,7 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;


@@ -361,7 +370,7 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__DARWIN__)

         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;
         m_mode = wxEOL_MAC;
 #else
         m_mode = wxEOL_UNIX;


@@ -444,9 +453,14 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
     return *this;
 }
 
     return *this;
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
+wxTextOutputStream& wxTextOutputStream::operator<<(char c)

 {
 {

-    WriteString( wxString(c) );
+    // these strange manipulations are needed in Unicode mode
+    char buf[2];
+    buf[0] = c;
+    buf[1] = 0;
+
+    WriteString( wxString(buf) );

     return *this;
 }
 
     return *this;
 }