*** empty log message ***

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

acconfig.h

@@ -544,6 +544,17 @@
 #define wxUSE_FS_INET 0
 #define wxUSE_FS_ZIP 0
 
+/*
+ * A class that shows info window when app is busy
+ * (works exactly like wxBusyCursor)
+ */
+#define wxUSE_BUSYINFO 0 
+
+/*
+ * Zip stream for accessing files stored inside .zip archives
+ */
+#define wxUSE_ZIPSTREAM 0
+ 
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.

configure.in

@@ -295,6 +295,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
+  DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=no
@@ -397,6 +399,8 @@ else
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
+  DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
@@ -531,6 +535,7 @@ WX_ARG_ENABLE(joystick,      [  --enable-joystick       compile in joystick supp
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
+WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
 
 dnl ---------------------------------------------------------------------------
 dnl "big" options (i.e. those which change a lot of things throughout the library)
@@ -687,6 +692,7 @@ WX_ARG_ENABLE(html,        [  --enable-html           use wxHTML sub-library], w
 WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
 WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
 WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
+WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
 
 dnl cache the options values before (may be) aborting below
 WX_ARG_CACHE_FLUSH
@@ -1556,6 +1562,14 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
   AC_DEFINE(wxUSE_FS_ZIP)
 fi
 
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+  AC_DEFINE(wxUSE_ZIPSTREAM)
+fi
+
+if test "$wxUSE_BUSYINFO" = "yes"; then
+  AC_DEFINE(wxUSE_BUSYINFO)
+fi
+
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
   AC_DEFINE(wxUSE_STD_IOSTREAM)
 fi

include/wx/busyinfo.h

@@ -23,6 +23,7 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_BUSYINFO
 
 #include <wx/dialog.h>
 
@@ -55,4 +56,4 @@ class wxBusyInfo : public wxObject
 
 #endif
 
-
+#endif

include/wx/msw/setup0.h

@@ -200,6 +200,14 @@
                                   // Set to 1 to use socket classes
 #define wxUSE_HTML          0
                                   // Set to 1 to use wxHTML sub-library
+#define wxUSE_FS_ZIP        0
+#define wxUSE_FS_INET       0     // Set to 1 to enable virtual file systems
+
+#define wxUSE_BUSYINFO      0
+                                  // wxBusyInfo displays window with message
+                                  // when app is busy. Works in same way as
+                                  // wxBusyCursor
+
 
 /*
  * Finer detail

include/wx/zipstream.h

@@ -13,7 +13,7 @@
 #pragma interface
 #endif
 
-#if wxUSE_ZLIB && wxUSE_STREAMS
+#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
 
 #include <wx/stream.h>
 
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxZipInputStream : public wxInputStream
 };
 
 
-#endif // if use_zlib && use_streams
+#endif // 
 
 #endif // __ZIPSTREAM_H__
 

src/common/filesys.cpp

@@ -23,7 +23,6 @@
 #endif
 
 #include <wx/wfstream.h>
-#include <wx/url.h>
 #include <wx/module.h>
 #include <wx/filesys.h>
 

src/common/unzip.c

@@ -4,6 +4,9 @@
    Read unzip.h for more info
 */
 
+#include "wx/setup.h"
+
+#if wxUSE_ZLIB && wxUSE_ZIPSTREAM
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1292,3 +1295,5 @@ extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
 		*(szComment+s->gi.size_comment)='\0';
 	return (int)uReadThis;
 }
+
+#endif

src/common/zipstream.cpp

@@ -20,6 +20,8 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+
 #include <wx/stream.h>
 #include <wx/wfstream.h>
 #include <wx/zipstream.h>
@@ -108,3 +110,4 @@ off_t wxZipInputStream::OnSysSeek(off_t seek, wxSeekMode mode)
     return m_Pos;
 }
 
+#endif

src/common/zstream.cpp

@@ -30,7 +30,7 @@
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
-#include "..\zlib\zlib.h"
+#include "../zlib/zlib.h"
 
 #define ZSTREAM_BUFFER_SIZE 1024
 

src/generic/busyinfo.cpp

@@ -20,6 +20,8 @@
 #include <wx/wx.h>
 #endif
 
+#if wxUSE_BUSYINFO
+
 #include "wx/busyinfo.h"
 
 
@@ -59,11 +61,4 @@ wxBusyInfo::~wxBusyInfo()
 
 
 
-
+#endif
-
-
-
-
-
-
-