Fixed the GetDataSource() function so the DsDesc that is returned is the full description

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 2592c03fe1f29fc384656e4ec6765e5bcfc0e199..cd0300b42df8532acd16b8fba338a9cd309ee2f1 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -150,7 +150,7 @@ double wxTextInputStream::ReadDouble()
     if (c==(wxChar)0) return 0;
 
     f = 0.0;
     if (c==(wxChar)0) return 0;
 
     f = 0.0;

-    if (! (c == wxT('.') || c == wxT('-') || c == wxT('+') || isdigit(c)) )
+    if (! (c == wxT('.') || c == wxT(',') || c == wxT('-') || c == wxT('+') || isdigit(c)) )

     {
         m_input.Ungetch(c);
         return 0.0;
     {
         m_input.Ungetch(c);
         return 0.0;


@@ -177,7 +177,7 @@ double wxTextInputStream::ReadDouble()
         c = m_input.GetC();
     }
 
         c = m_input.GetC();
     }
 

-    if (c == wxT('.'))
+    if (c == wxT('.') || c == wxT(','))

     {
         double f_multiplicator = (double) 0.1;
 
     {
         double f_multiplicator = (double) 0.1;
 


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

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)

   : m_output(s)
 {
   : m_output(s)
 {

+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }

 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 }
 
 }
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 }
 

+void wxTextOutputStream::SetMode(wxEOL mode)
+{
+    m_mode = mode;
+    if (m_mode == wxEOL_NATIVE)
+    {
+#if defined(__WXMSW__) || defined(__WXPM__)
+        m_mode = wxEOL_DOS;
+#elif defined(__WXMAC__)
+        m_mode = wxEOL_MAC;
+#else
+        m_mode = wxEOL_UNIX;
+#endif
+    }
+}
+

 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;
 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;


@@ -371,25 +397,22 @@ void wxTextOutputStream::WriteString(const wxString& string)
         wxChar c = string[i];
         if (c == wxT('\n'))
         {
         wxChar c = string[i];
         if (c == wxT('\n'))
         {

-#if   defined(__WINDOWS__)
-            c = wxT('\r');
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-            c = wxT('\n');
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__UNIX__)
-            c = wxT('\n');
-            m_output.Write( (const void*)(&c), sizeof(wxChar) );
-#elif defined(__WXMAC__)
-            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."
-#endif
+           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) );
+            }

         }
         else
         {
         }
         else
         {


@@ -418,25 +441,37 @@ wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {

-    Write16( (wxUint16)c );
+    wxString str;
+    str.Printf(wxT("%d"), (signed int)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt32 c)
 {

-    Write32( (wxUint32)c );
+    wxString str;
+    str.Printf(wxT("%ld"), (signed long)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint16 c)
 {

-    Write16(c);
+    wxString str;
+    str.Printf(wxT("%u"), (unsigned int)c);
+    WriteString(str);
+    

     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {
     return *this;
 }
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxUint32 c)
 {

-    Write32(c);
+    wxString str;
+    str.Printf(wxT("%lu"), (unsigned long)c);
+    WriteString(str);
+

     return *this;
 }
 
     return *this;
 }