Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index b1270b070a0175d87f822645d7e7f31ef2eebf73..e4799024edb7f4d274c3dd0fa8893a4a6db0acdb 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -46,10 +46,20 @@ public:
         {
             wxLogSysError(_("Pipe creation failed"));
 
         {
             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
     }
 
     // return TRUE if we were created successfully


@@ -88,7 +98,7 @@ private:
     int m_fds[2];
 };
 
     int m_fds[2];
 };
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_FILE

 
 #include "wx/wfstream.h"
 
 
 #include "wx/wfstream.h"
 


@@ -108,7 +118,21 @@ public:
     virtual bool CanRead() const;
 };
 
     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_
 
 
 #endif // _WX_UNIX_PIPE_H_