compile wxFileXXXStream without wxFFileXXXStream

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index 288371487464e431b9a4eb31afd6baa4ee30d5a6..d0d50a608cc129c12dfc3d5cfa1b8f50d6ba1a43 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -18,7 +18,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include "wx/object.h"
 #include "wx/string.h"
 
 #include "wx/object.h"
 #include "wx/string.h"


@@ -26,6 +26,8 @@
 #include "wx/file.h"
 #include "wx/ffile.h"
 
 #include "wx/file.h"
 #include "wx/ffile.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileStream using wxFile
 // ----------------------------------------------------------------------------


@@ -96,6 +98,10 @@ private:
     DECLARE_NO_COPY_CLASS(wxFileStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFileStream)
 };
 

+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+

 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFFileStream using wxFFile
 // ----------------------------------------------------------------------------


@@ -166,6 +172,8 @@ private:
     DECLARE_NO_COPY_CLASS(wxFFileStream)
 };
 
     DECLARE_NO_COPY_CLASS(wxFFileStream)
 };
 

-#endif // wxUSE_STREAMS && wxUSE_FILE
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS

 
 #endif // _WX_WXFSTREAM_H__
 
 #endif // _WX_WXFSTREAM_H__

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index f0b0178083e54f7f68967fe2287558a1333e956b..8370eebc6faac3f3332554139f29e37bfcee0aa8 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -20,12 +20,14 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_STREAMS && wxUSE_FILE
+#if wxUSE_STREAMS

 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 
 
 #include <stdio.h>
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 

+#if wxUSE_FILE
+

 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileInputStream
 // ----------------------------------------------------------------------------


@@ -191,6 +193,10 @@ wxFileStream::wxFileStream(const wxString& fileName)
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 
     wxFileOutputStream::m_file = wxFileInputStream::m_file;
 }
 

+#endif //wxUSE_FILE
+
+#if wxUSE_FFILE
+

 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFFileInputStream
 // ----------------------------------------------------------------------------


@@ -350,5 +356,7 @@ wxFFileStream::wxFFileStream(const wxString& fileName)
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 
     wxFFileOutputStream::m_file = wxFFileInputStream::m_file;
 }
 

-#endif // wxUSE_STREAMS && wxUSE_FILE
+#endif //wxUSE_FFILE
+
+#endif // wxUSE_STREAMS