updated wxExecute checks in wxGTK to be same as in other Unix ports after recent...

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 43deb545d3d419d5daf69951d3c58b8b145e9194..e516fb413034221ee8f7fcb8dd5cc965f2688e39 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -18,22 +18,14 @@
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

+#include "wx/txtstrm.h"
+

 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/crt.h"
 #endif
 

-#include "wx/txtstrm.h"

 #include <ctype.h>
 
 #include <ctype.h>
 

-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
-

 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------


@@ -109,7 +101,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&

-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)

           return c;
     }
 
           return c;
     }
 


@@ -229,7 +221,7 @@ wxString wxTextInputStream::ReadWord()
         if(c == wxEOT)
             break;
 
         if(c == wxEOT)
             break;
 

-        if (m_separators.Contains(c))
+        if (m_separators.Find(c) >= 0)

             break;
 
         if (EatEOL(c))
             break;
 
         if (EatEOL(c))


@@ -322,8 +314,6 @@ 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__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -344,8 +334,6 @@ 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__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif