Allow for multiple CHM controllers in app (don't leak dynamic libs)

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 4e8dae20acbba014b49e15bfe75bfe1a7a87177c..032474919c8427c224ac1885e7b469088007d56f 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:    wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -38,10 +38,17 @@
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 

+#if wxUSE_UNICODE
+wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv)
+{
+}
+#else

 wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
   : m_input(s), m_separators(sep)
 {
 }
 wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
   : m_input(s), m_separators(sep)
 {
 }

+#endif

 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {


@@ -52,31 +59,31 @@ wxChar wxTextInputStream::NextNonSeparators()
     wxChar c = (wxChar) 0;
     for (;;)
     {
     wxChar c = (wxChar) 0;
     for (;;)
     {

-       if (!m_input) return (wxChar) 0;
+        if (!m_input) return (wxChar) 0;

         c = m_input.GetC();
         c = m_input.GetC();

-       
-       if (c != wxT('\n') && 
-           c != wxT('\r') &&
-           !m_separators.Contains(c)) 
-         return c;
+
+        if (c != wxT('\n') &&
+            c != wxT('\r') &&
+            !m_separators.Contains(c))
+          return c;

     }
 
 }
 
     }
 
 }
 

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

     {
     {

-      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 (!m_input) return TRUE;
+        wxChar c2 = m_input.GetC();
+
+        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 )


@@ -88,11 +95,13 @@ void wxTextInputStream::SkipIfEndOfLine( wxChar c )
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */

+    // VZ: what about using strtol()?? (TODO)
+

     int sign;
     wxInt32 i;
 
     if (!m_input) return 0;
     int sign;
     wxInt32 i;
 
     if (!m_input) return 0;

-    int c = NextNonSeparators(); 
+    int c = NextNonSeparators();

     if (c==(wxChar)0) return 0;
 
     i = 0;
     if (c==(wxChar)0) return 0;
 
     i = 0;


@@ -141,11 +150,16 @@ wxUint8 wxTextInputStream::Read8()
 
 double wxTextInputStream::ReadDouble()
 {
 
 double wxTextInputStream::ReadDouble()
 {

-    /* I only implemented a simple float parser */
+    /* 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;
 


@@ -153,22 +167,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))


@@ -184,60 +198,73 @@ double wxTextInputStream::ReadDouble()
         c = m_input.GetC();
 
         while (isdigit(c))
         c = m_input.GetC();
 
         while (isdigit(c))

-       {
+        {

             f += (c-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;
             c = m_input.GetC();
         }
 
         if (c == wxT('e'))
             f += (c-wxT('0'))*f_multiplicator;
             f_multiplicator /= 10;
             c = m_input.GetC();
         }
 
         if (c == wxT('e'))

-       {
+        {

             double f_multiplicator = 0.0;
             int i, e;
 
             c = m_input.GetC();
 
             switch (c)
             double f_multiplicator = 0.0;
             int i, e;
 
             c = m_input.GetC();
 
             switch (c)

-           {
+            {

                 case wxT('-'): f_multiplicator = 0.1;  break;
                 case wxT('-'): f_multiplicator = 0.1;  break;

-               case wxT('+'): f_multiplicator = 10.0; break;
-           }
+                case wxT('+'): f_multiplicator = 10.0; break;
+            }

 
             e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
         }
 
             e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
         }

-       else
-           SkipIfEndOfLine( c );
+        else
+            SkipIfEndOfLine( c );

     }
     else
     {
         m_input.Ungetch(c);
     }
 
     }
     else
     {
         m_input.Ungetch(c);
     }
 

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

     return f;
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return f;
 }
 
 wxString wxTextInputStream::ReadString()
 {

-  return ReadLine();
+    return ReadLine();

 }
 
 wxString wxTextInputStream::ReadLine()
 {
 }
 
 wxString wxTextInputStream::ReadLine()
 {

-    wxChar c;

     wxString line;
 
     wxString line;
 

-    for (;;)
+    while ( !m_input.Eof() )

     {
     {

-        if (!m_input) break;
-        c = m_input.GetC();
-       
-       if (EatEOL(c)) break;
-       
+#if wxUSE_UNICODE
+        // FIXME: this is only works for single byte encodings
+        // How-to read a single char in an unkown encoding???
+        char buf[10];
+        buf[0] = m_input.GetC();
+        buf[1] = 0;
+        
+        wxChar wbuf[2];
+        m_conv.MB2WC( wbuf, buf, 2 );
+        wxChar c = wbuf[0];
+#else
+        char c = m_input.GetC();
+#endif
+        
+        if ( !m_input )
+            break;
+
+        if (EatEOL(c))
+            break;
+

         line += c;
     }
 
         line += c;
     }
 


@@ -246,22 +273,31 @@ wxString wxTextInputStream::ReadLine()
 
 wxString wxTextInputStream::ReadWord()
 {
 
 wxString wxTextInputStream::ReadWord()
 {

-    if (!m_input) return "";
-  

     wxString word;
     wxString word;

-    wxChar c=NextNonSeparators();
-    if (c==(wxChar)0) return "";

 
 

-    for (;;)
-    {
-       if (m_separators.Contains(c)) break;
-       
-       if (EatEOL(c)) break;
-       
-        word += c;
+    if ( !m_input )
+        return word;

 
 

-       if (!m_input) break;
+    wxChar c = NextNonSeparators();
+    if ( !c )
+        return word;
+
+    word += c;
+    
+    while ( !m_input.Eof() )
+    {

         c = m_input.GetC();
         c = m_input.GetC();

+        
+        if (!m_input)
+            break;
+            
+        if (m_separators.Contains(c))
+            break;
+
+        if (EatEOL(c))
+            break;
+
+        word += c;

     }
 
     return word;
     }
 
     return word;


@@ -269,21 +305,23 @@ wxString wxTextInputStream::ReadWord()
 
 wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 {
 
 wxTextInputStream& wxTextInputStream::operator>>(wxString& word)
 {

-  word = ReadWord();
-  return *this;
+    word = ReadWord();
+    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;
 }
 


@@ -323,15 +361,22 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
     return *this;
 }
 
     return *this;
 }
 

+
+
+#if wxUSE_UNICODE
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
+  : m_output(s), m_conv(conv)
+#else

 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)

+#endif

 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #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;


@@ -343,14 +388,14 @@ wxTextOutputStream::~wxTextOutputStream()
 {
 }
 
 {
 }
 

-void wxTextOutputStream::SetMode( wxEOL mode = wxEOL_NATIVE )
+void wxTextOutputStream::SetMode(wxEOL mode)

 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
 {
     m_mode = mode;
     if (m_mode == wxEOL_NATIVE)
     {
 #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;


@@ -392,33 +437,46 @@ void wxTextOutputStream::WriteDouble(double d)
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {

-    for (size_t i = 0; i < string.Len(); i++)
+    size_t len = string.length();
+
+    wxString out;
+    out.reserve(len);
+
+    for ( size_t i = 0; i < len; i++ )

     {
     {

-        wxChar c = string[i];
-        if (c == wxT('\n'))
+        const wxChar c = string[i];
+        if ( c == wxT('\n') )

         {
         {

-           if (m_mode == wxEOL_DOS)
-           {
-                 c = wxT('\r');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-                 c = wxT('\n');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-           } else 
-           if (m_mode == wxEOL_MAC)
-           {
-                 c = wxT('\r');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
-           } else
-           {
-                 c = wxT('\n');
-                 m_output.Write( (const void*)(&c), sizeof(wxChar) );
+            switch ( m_mode )
+            {
+                case wxEOL_DOS:
+                    out << _T("\r\n");
+                    continue;
+
+                case wxEOL_MAC:
+                    out << _T('\r');
+                    continue;
+
+                default:
+                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    // fall through
+
+                case wxEOL_UNIX:
+                    // don't treat '\n' specially
+                    ;

             }
         }
             }
         }

-        else
-        {
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-        }
+
+        out << c;

    }
    }

+
+    // We must not write the trailing NULL here
+#if wxUSE_UNICODE
+    wxCharBuffer buffer = m_conv.cWC2MB( out );
+    m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+#else
+    m_output.Write(out.c_str(), out.length() );
+#endif

 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)


@@ -433,9 +491,10 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
     return *this;
 }
 
     return *this;
 }
 

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

 {
 {

-    WriteString( wxString(c) );
+    WriteString( wxString::FromAscii(c) );
+    

     return *this;
 }
 
     return *this;
 }
 


@@ -444,7 +503,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
     wxString str;
     str.Printf(wxT("%d"), (signed int)c);
     WriteString(str);
     wxString str;
     str.Printf(wxT("%d"), (signed int)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }
 


@@ -453,7 +512,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
     wxString str;
     str.Printf(wxT("%ld"), (signed long)c);
     WriteString(str);
     wxString str;
     str.Printf(wxT("%ld"), (signed long)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }
 


@@ -462,7 +521,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
     wxString str;
     str.Printf(wxT("%u"), (unsigned int)c);
     WriteString(str);
     wxString str;
     str.Printf(wxT("%u"), (unsigned int)c);
     WriteString(str);

-    
+

     return *this;
 }
 
     return *this;
 }