Rename wxUSE_ARCSTREAM to wxUSE_ARCHIVE_STREAMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_STREAMS && wxUSE_ARCSTREAM
|
||||
#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
|
||||
|
||||
#include "wx/stream.h"
|
||||
#include "wx/filename.h"
|
||||
@@ -355,6 +355,6 @@ private:
|
||||
DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
|
||||
};
|
||||
|
||||
#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM
|
||||
#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS
|
||||
|
||||
#endif // _WX_ARCHIVE_H__
|
||||
|
@@ -933,12 +933,12 @@
|
||||
# define wxUSE_ZLIB 1
|
||||
# endif
|
||||
# endif
|
||||
# if !wxUSE_ARCSTREAM
|
||||
# if !wxUSE_ARCHIVE_STREAMS
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxZip requires wxArchive"
|
||||
# else
|
||||
# undef wxUSE_ARCSTREAM
|
||||
# define wxUSE_ARCSTREAM 1
|
||||
# undef wxUSE_ARCHIVE_STREAMS
|
||||
# define wxUSE_ARCHIVE_STREAMS 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_ZIPSTREAM */
|
||||
|
@@ -392,7 +392,7 @@
|
||||
#define wxUSE_FS_INET 1
|
||||
|
||||
// wxArchive classes for accessing archives such as zip and tar
|
||||
#define wxUSE_ARCSTREAM 1
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
|
||||
// Set to 1 to compile wxZipInput/OutputStream classes.
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
@@ -386,7 +386,7 @@
|
||||
#define wxUSE_FS_INET 1
|
||||
|
||||
// wxArchive classes for accessing archives such as zip and tar
|
||||
#define wxUSE_ARCSTREAM 1
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
|
||||
// Set to 1 to compile wxZipInput/OutputStream classes.
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
@@ -385,7 +385,7 @@
|
||||
#define wxUSE_FS_INET 0
|
||||
|
||||
// wxArchive classes for accessing archives such as zip and tar
|
||||
#define wxUSE_ARCSTREAM 0
|
||||
#define wxUSE_ARCHIVE_STREAMS 0
|
||||
|
||||
// Set to 1 to compile wxZipInput/OutputStream classes.
|
||||
#define wxUSE_ZIPSTREAM 0
|
||||
|
@@ -376,7 +376,7 @@
|
||||
#define wxUSE_FS_INET 1
|
||||
|
||||
// wxArchive classes for accessing archives such as zip and tar
|
||||
#define wxUSE_ARCSTREAM 1
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
|
||||
// Set to 1 to compile wxZipInput/OutputStream classes.
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
@@ -413,7 +413,7 @@
|
||||
#define wxUSE_FS_ZIP 1
|
||||
|
||||
// wxArchive classes for accessing archives such as zip and tar
|
||||
#define wxUSE_ARCSTREAM 1
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
|
||||
// Set to 1 to compile wxZipInput/OutputStream classes.
|
||||
#define wxUSE_ZIPSTREAM 1
|
||||
|
Reference in New Issue
Block a user