Rename wxUSE_ARCSTREAM to wxUSE_ARCHIVE_STREAMS

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

diff --git a/configure b/configure
index 198392c8b1570e078939da89270e619ea4efa5f5..fe583bd7c62cf542f4261d3f6e35b0a7b21bc013 100755 (executable)
--- a/configure
+++ b/configure
@@ -2155,7 +2155,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no

-  DEFAULT_wxUSE_ARCSTREAM=no
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=no

   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=no
 


@@ -2348,7 +2348,7 @@ else
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes

-  DEFAULT_wxUSE_ARCSTREAM=yes
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=yes

   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 


@@ -4681,21 +4681,21 @@ if test "${enable_arcstream+set}" = set; then
   enableval="$enable_arcstream"
 
                           if test "$enableval" = yes; then
   enableval="$enable_arcstream"
 
                           if test "$enableval" = yes; then

-                            ac_cv_use_arcstream='wxUSE_ARCSTREAM=yes'
+                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'

                           else
                           else

-                            ac_cv_use_arcstream='wxUSE_ARCSTREAM=no'
+                            ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_ARCSTREAM" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_arcstream='wxUSE_ARCSTREAM='$DEFAULT_wxUSE_ARCSTREAM
+                          ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS

 
 fi;
 
 
 fi;
 


@@ -4704,7 +4704,7 @@ fi;
             echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
           fi
 
             echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
           fi
 

-          if test "$wxUSE_ARCSTREAM" = yes; then
+          if test "$wxUSE_ARCHIVE_STREAMS" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -35472,15 +35472,15 @@ _ACEOF
 
 fi
 
 
 fi
 

-if test "$wxUSE_ARCSTREAM" = "yes"; then
+if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then

   cat >>confdefs.h <<\_ACEOF
   cat >>confdefs.h <<\_ACEOF

-#define wxUSE_ARCSTREAM 1
+#define wxUSE_ARCHIVE_STREAMS 1

 _ACEOF
 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 _ACEOF
 
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then

-  if test "$wxUSE_ARCSTREAM" != "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then

     { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5
 echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
   elif test "$wxUSE_ZLIB" = "no"; then
     { echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5
 echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
   elif test "$wxUSE_ZLIB" = "no"; then

diff --git a/configure.in b/configure.in
index b0548d4a74fb0eb0b4c1bfb970993546f21150ec..edae0c269c78be2d7e6fe5c4e434026bca6c1e9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -500,7 +500,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no

-  DEFAULT_wxUSE_ARCSTREAM=no
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=no

   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=no
 


@@ -693,7 +693,7 @@ else
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes

-  DEFAULT_wxUSE_ARCSTREAM=yes
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=yes

   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 


@@ -886,7 +886,7 @@ WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communi
 
 dnl please keep the settings below in alphabetical order
 WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
 
 dnl please keep the settings below in alphabetical order
 WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)

-WX_ARG_ENABLE(arcstream,     [  --enable-arcstream      use wxArchive streams], wxUSE_ARCSTREAM)
+WX_ARG_ENABLE(arcstream,     [  --enable-arcstream      use wxArchive streams], wxUSE_ARCHIVE_STREAMS)

 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
 WX_ARG_ENABLE(backtrace,     [  --enable-backtrace      use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
 WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
 WX_ARG_ENABLE(backtrace,     [  --enable-backtrace      use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
 WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)


@@ -4768,12 +4768,12 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
   AC_DEFINE(wxUSE_FS_ZIP)
 fi
 
   AC_DEFINE(wxUSE_FS_ZIP)
 fi
 

-if test "$wxUSE_ARCSTREAM" = "yes"; then
-  AC_DEFINE(wxUSE_ARCSTREAM)
+if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
+  AC_DEFINE(wxUSE_ARCHIVE_STREAMS)

 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then

-  if test "$wxUSE_ARCSTREAM" != "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then

     AC_MSG_WARN(wxZip requires wxArchive... disabled)
   elif test "$wxUSE_ZLIB" = "no"; then
     AC_MSG_WARN(wxZip requires wxZlib... disabled)
     AC_MSG_WARN(wxZip requires wxArchive... disabled)
   elif test "$wxUSE_ZLIB" = "no"; then
     AC_MSG_WARN(wxZip requires wxZlib... disabled)

diff --git a/include/wx/archive.h b/include/wx/archive.h
index aee02d5bee1cc078ccffbbe6a8cc0f9c4ed5dea3..c38ac18ce6b31e75a56efab40ed7380f50c567aa 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -16,7 +16,7 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_STREAMS && wxUSE_ARCSTREAM
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

 
 #include "wx/stream.h"
 #include "wx/filename.h"
 
 #include "wx/stream.h"
 #include "wx/filename.h"


@@ -355,6 +355,6 @@ private:
     DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
 };
 
     DECLARE_ABSTRACT_CLASS(wxArchiveClassFactory)
 };
 

-#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

 
 #endif // _WX_ARCHIVE_H__
 
 #endif // _WX_ARCHIVE_H__

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 744fbf061765672a765548e2b8b1af0f0916422d..c69e95ebd625e871920e6ec303b9e683ed6e3b88 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -933,12 +933,12 @@
 #           define wxUSE_ZLIB 1
 #       endif
 #   endif
 #           define wxUSE_ZLIB 1
 #       endif
 #   endif

-#   if !wxUSE_ARCSTREAM
+#   if !wxUSE_ARCHIVE_STREAMS

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxZip requires wxArchive"
 #       else
 #       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 */
 #       endif
 #   endif
 #endif /* wxUSE_ZIPSTREAM */

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index 4016f8c0b782ec565c1b7948212d89fdfc75bc7a..6961260b6f9f24db77ad5393e614cdf32de6e82f 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -392,7 +392,7 @@
 #define wxUSE_FS_INET       1
 
 // wxArchive classes for accessing archives such as zip and tar
 #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
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM     1

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 072614db88b1e3f8b4c80a2d01f32bd7e0407e61..33b42014d61333950ad95ebf377ee87247343419 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -386,7 +386,7 @@
 #define wxUSE_FS_INET       1
 
 // wxArchive classes for accessing archives such as zip and tar
 #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
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM     1

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 393bb97f8d4f99201def2a4444e8787f1c1203f8..04b68df6f4f78f78780de589b74ac78583f34e6c 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -385,7 +385,7 @@
 #define wxUSE_FS_INET       0
 
 // wxArchive classes for accessing archives such as zip and tar
 #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
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM     0

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 924ae0452c7a76af16ade1b645927e3fbe59727c..a0cd361396bb4ccf89e6caca19632374c7cc4e22 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -376,7 +376,7 @@
 #define wxUSE_FS_INET       1
 
 // wxArchive classes for accessing archives such as zip and tar
 #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
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM     1

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index fd9e2f27ee9fe0cd3a3b56f50d687b8b89e81857..05078462042186f9da1f84430abd7a8309e387f9 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -413,7 +413,7 @@
 #define wxUSE_FS_ZIP 1
 
 // wxArchive classes for accessing archives such as zip and tar
 #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
 
 // Set to 1 to compile wxZipInput/OutputStream classes.
 #define wxUSE_ZIPSTREAM 1

diff --git a/setup.h.in b/setup.h.in
index c7e4bb9aea7e5abfcda7f8b8e7d629eb55d4775a..7228fe9a0d44f00cacd17805b57acfec00cc9a4e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -240,7 +240,7 @@
 
 #define wxUSE_FS_INET       0
 
 
 #define wxUSE_FS_INET       0
 

-#define wxUSE_ARCSTREAM     0
+#define wxUSE_ARCHIVE_STREAMS     0

 
 #define wxUSE_ZIPSTREAM     0
 
 
 #define wxUSE_ZIPSTREAM     0
 

diff --git a/setup.h_vms b/setup.h_vms
index aba06441bff19c08db45ecb0b5e39a4200a223a8..aa75a737faaa39eec31f9edf14136ca079d7e22e 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -249,7 +249,7 @@
 
 #define wxUSE_FS_INET       1
 
 
 #define wxUSE_FS_INET       1
 

-#define wxUSE_ARCSTREAM     1
+#define wxUSE_ARCHIVE_STREAMS     1

 
 #define wxUSE_ZIPSTREAM     1
 
 
 #define wxUSE_ZIPSTREAM     1
 

diff --git a/src/common/archive.cpp b/src/common/archive.cpp
index debb3b0bbeeadc0196b7524981afcb339b995cec..8ad3fcc2bd2a95794a24f7a2588867484aa4d6e9 100644 (file)
--- a/src/common/archive.cpp
+++ b/src/common/archive.cpp
@@ -22,7 +22,7 @@
   #include "wx/defs.h"
 #endif
 
   #include "wx/defs.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_ARCSTREAM
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

 
 #include "wx/archive.h"
 #include "wx/html/forcelnk.h"
 
 #include "wx/archive.h"
 #include "wx/html/forcelnk.h"


@@ -73,4 +73,4 @@ wxArchiveEntry& wxArchiveEntry::operator=(const wxArchiveEntry& WXUNUSED(e))
     return *this;
 }
 
     return *this;
 }
 

-#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

diff --git a/tests/archive/archivetest.cpp b/tests/archive/archivetest.cpp
index fc50a5217f3c667131d268c94e6bdcef14cb08c7..b9a6191c29086b69ad100ae245f3f3ddffbf487c 100644 (file)
--- a/tests/archive/archivetest.cpp
+++ b/tests/archive/archivetest.cpp
@@ -17,7 +17,7 @@
 #   include "wx/wx.h"
 #endif
 
 #   include "wx/wx.h"
 #endif
 

-#if wxUSE_STREAMS && wxUSE_ARCSTREAM
+#if wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS

 
 // VC++ 6 warns that the list iterator's '->' operator will not work whenever
 // std::list is used with a non-pointer, so switch it off.
 
 // VC++ 6 warns that the list iterator's '->' operator will not work whenever
 // std::list is used with a non-pointer, so switch it off.


@@ -1284,4 +1284,4 @@ template class ArchiveTestCase<wxArchiveClassFactory>;
 template class ArchiveTestCase<wxZipClassFactory>;
 #endif
 
 template class ArchiveTestCase<wxZipClassFactory>;
 #endif
 

-#endif // wxUSE_STREAMS && wxUSE_ARCSTREAM
+#endif // wxUSE_STREAMS && wxUSE_ARCHIVE_STREAMS