enum wxWebViewBackend has been removed.

[wxWidgets.git] / include / wx / unix / pipe.h

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index a3a8e6e7a376a9a968b19ba13d475ab4a86d869b..e4799024edb7f4d274c3dd0fa8893a4a6db0acdb 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -6,7 +6,7 @@
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_PIPE_H_
@@ -28,8 +28,7 @@ public:
     enum Direction
     {
         Read,
-        Write,
-        Direction_Max
+        Write
     };
 
     enum
@@ -47,10 +46,20 @@ public:
         {
             wxLogSysError(_("Pipe creation failed"));
 
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
+    }
+
+    // switch the given end of the pipe to non-blocking IO
+    bool MakeNonBlocking(Direction which)
+    {
+        const int flags = fcntl(m_fds[which], F_GETFL, 0);
+        if ( flags == -1 )
+            return false;
+
+        return fcntl(m_fds[which], F_SETFL, flags | O_NONBLOCK) == 0;
     }
 
     // return TRUE if we were created successfully
@@ -75,7 +84,10 @@ public:
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )
+            {
                 close(m_fds[n]);
+                m_fds[n] = INVALID_FD;
+            }
         }
     }
 
@@ -83,10 +95,10 @@ public:
     ~wxPipe() { Close(); }
 
 private:
-    int m_fds[Direction_Max];
+    int m_fds[2];
 };
 
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_FILE
 
 #include "wx/wfstream.h"
 
@@ -106,7 +118,21 @@ public:
     virtual bool CanRead() const;
 };
 
-#endif // wxUSE_STREAMS
+// ----------------------------------------------------------------------------
+// wxPipeOutputStream: stream for writing to a pipe
+// ----------------------------------------------------------------------------
+
+class wxPipeOutputStream : public wxFileOutputStream
+{
+public:
+    wxPipeOutputStream(int fd) : wxFileOutputStream(fd) { }
+
+    // Override the base class version to ignore "pipe full" errors: this is
+    // not an error for this class.
+    size_t OnSysWrite(const void *buffer, size_t size);
+};
+
+#endif // wxUSE_STREAMS && wxUSE_FILE
 
 #endif // _WX_UNIX_PIPE_H_