make wxVarVScrollLegacyAdaptor::OnGetLineHeight() non-pure virtual to fix compilation...

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

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index 356ee9d394e55a45d14fb537998fa4a2939d871e..d59553d1544f52d7bcdb1ea2d920872ce31b5aa9 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -74,7 +74,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;
+            }
         }
     }
 
@@ -85,7 +88,7 @@ private:
     int m_fds[2];
 };
 
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_FILE
 
 #include "wx/wfstream.h"
 
@@ -105,7 +108,7 @@ public:
     virtual bool CanRead() const;
 };
 
-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_FILE
 
 #endif // _WX_UNIX_PIPE_H_