Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile wxFileXXXStream without wxFFileXXXStream

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2005-02-17 10:42:22 +00:00
parent 2d1659cf32
commit 859906241d
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/wfstream.h
View File

@@ -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/object.h"
#include "wx/string.h" #include "wx/string.h"
@@ -26,6 +26,8 @@
#include "wx/file.h" #include "wx/file.h"
#include "wx/ffile.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__

12
src/common/wfstream.cpp
View File

@@ -20,12 +20,14 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_STREAMS && wxUSE_FILE #if wxUSE_STREAMS
#include <stdio.h> #include <stdio.h>
#include "wx/stream.h" #include "wx/stream.h"
#include "wx/wfstream.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