another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index a142b752a98585d3c1034bb3bae157e908047ce8..d59553d1544f52d7bcdb1ea2d920872ce31b5aa9 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +14,9 @@
 
 #include <unistd.h>
 
 
 #include <unistd.h>
 

+#include "wx/log.h"
+#include "wx/intl.h"
+

 // ----------------------------------------------------------------------------
 // wxPipe: this class encapsulates pipe() system call
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPipe: this class encapsulates pipe() system call
 // ----------------------------------------------------------------------------


@@ -53,21 +56,12 @@ public:
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 
     // return the descriptor for one of the pipe ends
     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)
     {
 
     // 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;
 
         int fd = m_fds[which];
         m_fds[which] = INVALID_FD;
 


@@ -80,7 +74,10 @@ public:
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )

+            {

                 close(m_fds[n]);
                 close(m_fds[n]);

+                m_fds[n] = INVALID_FD;
+            }

         }
     }
 
         }
     }
 


@@ -91,5 +88,27 @@ private:
     int m_fds[2];
 };
 
     int m_fds[2];
 };
 

+#if wxUSE_STREAMS && wxUSE_FILE
+
+#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 && wxUSE_FILE
+

 #endif // _WX_UNIX_PIPE_H_
 
 #endif // _WX_UNIX_PIPE_H_