Take the hgap and vgap into account when doing alignments in grid

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

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index 93257ea4565abfa5ec97732ca39657a613008f64..aa0f59f4bc45ed9d1a48cf374ec8c1da62d500e3 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -28,7 +28,8 @@ public:
     enum Direction
     {
         Read,
-        Write
+        Write,
+        Direction_Max
     };
 
     enum
@@ -56,21 +57,12 @@ public:
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 
     // return the descriptor for one of the pipe ends
-    int operator[](Direction which) const
-    {
-        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
-                      _T("invalid pipe index") );
-
-        return m_fds[which];
-    }
+    int operator[](Direction which) const { return m_fds[which]; }
 
     // detach a descriptor, meaning that the pipe dtor won't close it, and
     // return it
     int Detach(Direction which)
     {
-        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
-                      _T("invalid pipe index") );
-
         int fd = m_fds[which];
         m_fds[which] = INVALID_FD;
 
@@ -91,8 +83,30 @@ public:
     ~wxPipe() { Close(); }
 
 private:
-    int m_fds[2];
+    int m_fds[Direction_Max];
+};
+
+#if wxUSE_STREAMS
+
+#include "wx/wfstream.h"
+
+// ----------------------------------------------------------------------------
+// wxPipeInputStream: stream for reading from a pipe
+// ----------------------------------------------------------------------------
+
+class wxPipeInputStream : public wxFileInputStream
+{
+public:
+    wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
+
+    // return TRUE if the pipe is still opened
+    bool IsOpened() const { return !Eof(); }
+
+    // return TRUE if we have anything to read, don't block
+    virtual bool CanRead() const;
 };
 
+#endif // wxUSE_STREAMS
+
 #endif // _WX_UNIX_PIPE_H_