From 916af76f40555e9d2548a1538e2a5563222ea373 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 29 Oct 2006 20:06:45 +0000 Subject: [PATCH] Make wxBackingFile internal, and remove wxZipFSHander, add a typedef to wxArchiveFSHandler for compatibilty. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 19 ---- build/bakefiles/files.bkl | 2 - build/msw/makefile.bcc | 16 --- build/msw/makefile.gcc | 16 --- build/msw/makefile.vc | 16 --- build/msw/makefile.wat | 16 --- build/msw/wx_base.dsp | 8 -- configure | 100 +++++------------ configure.in | 33 +++--- include/wx/chkconf.h | 65 ++++------- include/wx/fs_zip.h | 79 ++++--------- include/wx/mac/setup0.h | 3 - include/wx/motif/setup0.h | 3 - include/wx/msw/setup0.h | 3 - include/wx/msw/wince/setup.h | 3 - include/wx/os2/setup0.h | 3 - include/wx/palmos/setup0.h | 3 - include/wx/private/fileback.h | 83 ++++++++++++++ include/wx/setup_inc.h | 3 - include/wx/univ/setup0.h | 3 - setup.h.in | 2 - setup.h_vms | 2 - src/common/fileback.cpp | 6 +- src/common/filesys.cpp | 2 +- src/common/fs_arc.cpp | 3 +- src/common/fs_zip.cpp | 256 ------------------------------------------ src/wxWindows.dsp | 8 -- wxGTK.spec | 1 - wxMotif.spec | 1 - wxX11.spec | 1 - 30 files changed, 178 insertions(+), 581 deletions(-) rewrite include/wx/fs_zip.h (80%) create mode 100644 include/wx/private/fileback.h delete mode 100644 src/common/fs_zip.cpp diff --git a/Makefile.in b/Makefile.in index a00b8d3..f787daa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -252,7 +252,6 @@ ALL_BASE_HEADERS = \ wx/features.h \ wx/ffile.h \ wx/file.h \ - wx/fileback.h \ wx/fileconf.h \ wx/filefn.h \ wx/filename.h \ @@ -387,7 +386,6 @@ ALL_PORTS_BASE_HEADERS = \ wx/features.h \ wx/ffile.h \ wx/file.h \ - wx/fileback.h \ wx/fileconf.h \ wx/filefn.h \ wx/filename.h \ @@ -554,7 +552,6 @@ ALL_BASE_SOURCES = \ src/common/fmapbase.cpp \ src/common/fs_arc.cpp \ src/common/fs_filter.cpp \ - src/common/fs_zip.cpp \ src/common/hash.cpp \ src/common/hashmap.cpp \ src/common/init.cpp \ @@ -710,7 +707,6 @@ MONODLL_OBJECTS = \ monodll_fmapbase.o \ monodll_fs_arc.o \ monodll_fs_filter.o \ - monodll_fs_zip.o \ monodll_hash.o \ monodll_hashmap.o \ monodll_init.o \ @@ -810,7 +806,6 @@ MONOLIB_OBJECTS = \ monolib_fmapbase.o \ monolib_fs_arc.o \ monolib_fs_filter.o \ - monolib_fs_zip.o \ monolib_hash.o \ monolib_hashmap.o \ monolib_init.o \ @@ -912,7 +907,6 @@ BASEDLL_OBJECTS = \ basedll_fmapbase.o \ basedll_fs_arc.o \ basedll_fs_filter.o \ - basedll_fs_zip.o \ basedll_hash.o \ basedll_hashmap.o \ basedll_init.o \ @@ -997,7 +991,6 @@ BASELIB_OBJECTS = \ baselib_fmapbase.o \ baselib_fs_arc.o \ baselib_fs_filter.o \ - baselib_fs_zip.o \ baselib_hash.o \ baselib_hashmap.o \ baselib_init.o \ @@ -12247,9 +12240,6 @@ monodll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONODLL_ODEP) monodll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp -monodll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp - monodll_hash.o: $(srcdir)/src/common/hash.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp @@ -16345,9 +16335,6 @@ monolib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(MONOLIB_ODEP) monolib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp -monolib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp - monolib_hash.o: $(srcdir)/src/common/hash.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp @@ -20446,9 +20433,6 @@ basedll_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASEDLL_ODEP) basedll_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp -basedll_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASEDLL_ODEP) - $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp - basedll_hash.o: $(srcdir)/src/common/hash.cpp $(BASEDLL_ODEP) $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $(srcdir)/src/common/hash.cpp @@ -21034,9 +21018,6 @@ baselib_fs_arc.o: $(srcdir)/src/common/fs_arc.cpp $(BASELIB_ODEP) baselib_fs_filter.o: $(srcdir)/src/common/fs_filter.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_filter.cpp -baselib_fs_zip.o: $(srcdir)/src/common/fs_zip.cpp $(BASELIB_ODEP) - $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/fs_zip.cpp - baselib_hash.o: $(srcdir)/src/common/hash.cpp $(BASELIB_ODEP) $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $(srcdir)/src/common/hash.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 93225d5..cbd6fbc 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -316,7 +316,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/fmapbase.cpp src/common/fs_arc.cpp src/common/fs_filter.cpp - src/common/fs_zip.cpp src/common/hash.cpp src/common/hashmap.cpp src/common/init.cpp @@ -395,7 +394,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/features.h wx/ffile.h wx/file.h - wx/fileback.h wx/fileconf.h wx/filefn.h wx/filename.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 5e36077..795079b 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -230,7 +230,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_fmapbase.obj \ $(OBJS)\monodll_fs_arc.obj \ $(OBJS)\monodll_fs_filter.obj \ - $(OBJS)\monodll_fs_zip.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ $(OBJS)\monodll_init.obj \ @@ -351,7 +350,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_fmapbase.obj \ $(OBJS)\monolib_fs_arc.obj \ $(OBJS)\monolib_fs_filter.obj \ - $(OBJS)\monolib_fs_zip.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ $(OBJS)\monolib_init.obj \ @@ -473,7 +471,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_fmapbase.obj \ $(OBJS)\basedll_fs_arc.obj \ $(OBJS)\basedll_fs_filter.obj \ - $(OBJS)\basedll_fs_zip.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ $(OBJS)\basedll_init.obj \ @@ -579,7 +576,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_fmapbase.obj \ $(OBJS)\baselib_fs_arc.obj \ $(OBJS)\baselib_fs_filter.obj \ - $(OBJS)\baselib_fs_zip.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ $(OBJS)\baselib_init.obj \ @@ -4593,9 +4589,6 @@ $(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6577,9 +6570,6 @@ $(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8564,9 +8554,6 @@ $(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) $** @@ -8834,9 +8821,6 @@ $(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index d9e5c1b..c018c49 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -216,7 +216,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_fmapbase.o \ $(OBJS)\monodll_fs_arc.o \ $(OBJS)\monodll_fs_filter.o \ - $(OBJS)\monodll_fs_zip.o \ $(OBJS)\monodll_hash.o \ $(OBJS)\monodll_hashmap.o \ $(OBJS)\monodll_init.o \ @@ -337,7 +336,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_fmapbase.o \ $(OBJS)\monolib_fs_arc.o \ $(OBJS)\monolib_fs_filter.o \ - $(OBJS)\monolib_fs_zip.o \ $(OBJS)\monolib_hash.o \ $(OBJS)\monolib_hashmap.o \ $(OBJS)\monolib_init.o \ @@ -460,7 +458,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_fmapbase.o \ $(OBJS)\basedll_fs_arc.o \ $(OBJS)\basedll_fs_filter.o \ - $(OBJS)\basedll_fs_zip.o \ $(OBJS)\basedll_hash.o \ $(OBJS)\basedll_hashmap.o \ $(OBJS)\basedll_init.o \ @@ -566,7 +563,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_fmapbase.o \ $(OBJS)\baselib_fs_arc.o \ $(OBJS)\baselib_fs_filter.o \ - $(OBJS)\baselib_fs_zip.o \ $(OBJS)\baselib_hash.o \ $(OBJS)\baselib_hashmap.o \ $(OBJS)\baselib_init.o \ @@ -4710,9 +4706,6 @@ $(OBJS)\monodll_fs_arc.o: ../../src/common/fs_arc.cpp $(OBJS)\monodll_fs_filter.o: ../../src/common/fs_filter.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monodll_fs_zip.o: ../../src/common/fs_zip.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monodll_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6794,9 +6787,6 @@ $(OBJS)\monolib_fs_arc.o: ../../src/common/fs_arc.cpp $(OBJS)\monolib_fs_filter.o: ../../src/common/fs_filter.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\monolib_fs_zip.o: ../../src/common/fs_zip.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\monolib_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -8881,9 +8871,6 @@ $(OBJS)\basedll_fs_arc.o: ../../src/common/fs_arc.cpp $(OBJS)\basedll_fs_filter.o: ../../src/common/fs_filter.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\basedll_fs_zip.o: ../../src/common/fs_zip.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\basedll_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< @@ -9151,9 +9138,6 @@ $(OBJS)\baselib_fs_arc.o: ../../src/common/fs_arc.cpp $(OBJS)\baselib_fs_filter.o: ../../src/common/fs_filter.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\baselib_fs_zip.o: ../../src/common/fs_zip.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - $(OBJS)\baselib_hash.o: ../../src/common/hash.cpp $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 32582c7..299ded5 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -231,7 +231,6 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_fmapbase.obj \ $(OBJS)\monodll_fs_arc.obj \ $(OBJS)\monodll_fs_filter.obj \ - $(OBJS)\monodll_fs_zip.obj \ $(OBJS)\monodll_hash.obj \ $(OBJS)\monodll_hashmap.obj \ $(OBJS)\monodll_init.obj \ @@ -357,7 +356,6 @@ MONOLIB_OBJECTS = \ $(OBJS)\monolib_fmapbase.obj \ $(OBJS)\monolib_fs_arc.obj \ $(OBJS)\monolib_fs_filter.obj \ - $(OBJS)\monolib_fs_zip.obj \ $(OBJS)\monolib_hash.obj \ $(OBJS)\monolib_hashmap.obj \ $(OBJS)\monolib_init.obj \ @@ -485,7 +483,6 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_fmapbase.obj \ $(OBJS)\basedll_fs_arc.obj \ $(OBJS)\basedll_fs_filter.obj \ - $(OBJS)\basedll_fs_zip.obj \ $(OBJS)\basedll_hash.obj \ $(OBJS)\basedll_hashmap.obj \ $(OBJS)\basedll_init.obj \ @@ -597,7 +594,6 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_fmapbase.obj \ $(OBJS)\baselib_fs_arc.obj \ $(OBJS)\baselib_fs_filter.obj \ - $(OBJS)\baselib_fs_zip.obj \ $(OBJS)\baselib_hash.obj \ $(OBJS)\baselib_hashmap.obj \ $(OBJS)\baselib_init.obj \ @@ -4926,9 +4922,6 @@ $(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** - $(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6910,9 +6903,6 @@ $(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** - $(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8897,9 +8887,6 @@ $(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** -$(OBJS)\basedll_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** - $(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $** @@ -9167,9 +9154,6 @@ $(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp $(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** -$(OBJS)\baselib_fs_zip.obj: ..\..\src\common\fs_zip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** - $(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index d74f079..6f00a60 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -2943,7 +2943,6 @@ MONODLL_OBJECTS = & $(OBJS)\monodll_fmapbase.obj & $(OBJS)\monodll_fs_arc.obj & $(OBJS)\monodll_fs_filter.obj & - $(OBJS)\monodll_fs_zip.obj & $(OBJS)\monodll_hash.obj & $(OBJS)\monodll_hashmap.obj & $(OBJS)\monodll_init.obj & @@ -3064,7 +3063,6 @@ MONOLIB_OBJECTS = & $(OBJS)\monolib_fmapbase.obj & $(OBJS)\monolib_fs_arc.obj & $(OBJS)\monolib_fs_filter.obj & - $(OBJS)\monolib_fs_zip.obj & $(OBJS)\monolib_hash.obj & $(OBJS)\monolib_hashmap.obj & $(OBJS)\monolib_init.obj & @@ -3187,7 +3185,6 @@ BASEDLL_OBJECTS = & $(OBJS)\basedll_fmapbase.obj & $(OBJS)\basedll_fs_arc.obj & $(OBJS)\basedll_fs_filter.obj & - $(OBJS)\basedll_fs_zip.obj & $(OBJS)\basedll_hash.obj & $(OBJS)\basedll_hashmap.obj & $(OBJS)\basedll_init.obj & @@ -3294,7 +3291,6 @@ BASELIB_OBJECTS = & $(OBJS)\baselib_fmapbase.obj & $(OBJS)\baselib_fs_arc.obj & $(OBJS)\baselib_fs_filter.obj & - $(OBJS)\baselib_fs_zip.obj & $(OBJS)\baselib_hash.obj & $(OBJS)\baselib_hashmap.obj & $(OBJS)\baselib_init.obj & @@ -4938,9 +4934,6 @@ $(OBJS)\monodll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp $(OBJS)\monodll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - $(OBJS)\monodll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7022,9 +7015,6 @@ $(OBJS)\monolib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp $(OBJS)\monolib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - $(OBJS)\monolib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9109,9 +9099,6 @@ $(OBJS)\basedll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp $(OBJS)\basedll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< -$(OBJS)\basedll_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - $(OBJS)\basedll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< @@ -9379,9 +9366,6 @@ $(OBJS)\baselib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp $(OBJS)\baselib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< -$(OBJS)\baselib_fs_zip.obj : .AUTODEPEND ..\..\src\common\fs_zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - $(OBJS)\baselib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 46aafff..089d8d2 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -579,10 +579,6 @@ SOURCE=..\..\src\common\fs_mem.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\fs_zip.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\hash.cpp # End Source File # Begin Source File @@ -1531,10 +1527,6 @@ SOURCE=..\..\include\wx\file.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fileback.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\fileconf.h # End Source File # Begin Source File diff --git a/configure b/configure index 165d8ca..841a30a 100755 --- a/configure +++ b/configure @@ -981,7 +981,6 @@ Optional Features: --enable-ipc use interprocess communication (wxSocket etc.) --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams - --enable-backingfile use wxBackingFile --enable-backtrace use wxStackWalker class for getting backtraces --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only) --enable-cmdline use wxCmdLineParser class @@ -997,7 +996,7 @@ Optional Features: --enable-fontmap use font encodings conversion classes --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems - --enable-fs_zip use virtual ZIP filesystems + --enable-fs_zip now replaced by fs_archive --enable-geometry use geometry class --enable-log use logging system --enable-longlong use wxLongLong class @@ -2321,7 +2320,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ARCHIVE_STREAMS=no DEFAULT_wxUSE_ZIPSTREAM=no DEFAULT_wxUSE_TARSTREAM=no - DEFAULT_wxUSE_BACKINGFILE=no DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no @@ -2542,7 +2540,6 @@ else DEFAULT_wxUSE_ARCHIVE_STREAMS=yes DEFAULT_wxUSE_ZIPSTREAM=yes DEFAULT_wxUSE_TARSTREAM=yes - DEFAULT_wxUSE_BACKINGFILE=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -5069,47 +5066,6 @@ echo "${ECHO_T}no" >&6 enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backingfile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-backingfile... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-backingfile or --disable-backingfile was given. -if test "${enable_backingfile+set}" = set; then - enableval="$enable_backingfile" - - if test "$enableval" = yes; then - ac_cv_use_backingfile='wxUSE_BACKINGFILE=yes' - else - ac_cv_use_backingfile='wxUSE_BACKINGFILE=no' - fi - -else - - LINE=`grep "wxUSE_BACKINGFILE" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_backingfile='wxUSE_BACKINGFILE='$DEFAULT_wxUSE_BACKINGFILE - -fi; - - eval "$ac_cv_use_backingfile" - if test "$no_cache" != 1; then - echo $ac_cv_use_backingfile >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_BACKINGFILE" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6 no_cache=0 @@ -29861,7 +29817,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -29888,7 +29844,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -29902,18 +29858,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -29951,7 +29907,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -43401,24 +43357,11 @@ _ACEOF fi -if test "$wxUSE_FILESYSTEM" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FILESYSTEM 1 -_ACEOF - -fi - -if test "$wxUSE_FS_ZIP" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FS_ZIP 1 -_ACEOF - -fi - if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then if test "$wxUSE_STREAMS" != yes; then { echo "$as_me:$LINENO: WARNING: wxArchive requires wxStreams... disabled" >&5 echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;} + wxUSE_ARCHIVE_STREAMS=no else cat >>confdefs.h <<\_ACEOF #define wxUSE_ARCHIVE_STREAMS 1 @@ -43454,22 +43397,23 @@ _ACEOF fi fi -if test "$wxUSE_BACKINGFILE" = "yes"; then +if test "$wxUSE_FILESYSTEM" = "yes"; then if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then - { echo "$as_me:$LINENO: WARNING: wxBackingFile requires wxStreams and wxFile or wxFFile... disabled" >&5 -echo "$as_me: WARNING: wxBackingFile requires wxStreams and wxFile or wxFFile... disabled" >&2;} + { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 +echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;} + wxUSE_FILESYSTEM=no else cat >>confdefs.h <<\_ACEOF -#define wxUSE_BACKINGFILE 1 +#define wxUSE_FILESYSTEM 1 _ACEOF fi fi if test "$wxUSE_FS_ARCHIVE" = "yes"; then - if test "$wxUSE_ARCHIVE_STREAMS" != yes -o "$wxUSE_BACKINGFILE" != yes; then - { echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled" >&5 -echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled" >&2;} + if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then + { echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5 +echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;} else cat >>confdefs.h <<\_ACEOF #define wxUSE_FS_ARCHIVE 1 @@ -43478,6 +43422,18 @@ _ACEOF fi fi +if test "$wxUSE_FS_ZIP" = "yes"; then + if test "$wxUSE_FS_ARCHIVE" != yes; then + { echo "$as_me:$LINENO: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5 +echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;} + else + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FS_ZIP 1 +_ACEOF + + fi +fi + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then if test "$USE_UNIX" != 1; then { echo "$as_me:$LINENO: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5 diff --git a/configure.in b/configure.in index be7ee02..9b7290d 100644 --- a/configure.in +++ b/configure.in @@ -508,7 +508,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ARCHIVE_STREAMS=no DEFAULT_wxUSE_ZIPSTREAM=no DEFAULT_wxUSE_TARSTREAM=no - DEFAULT_wxUSE_BACKINGFILE=no DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no @@ -729,7 +728,6 @@ else DEFAULT_wxUSE_ARCHIVE_STREAMS=yes DEFAULT_wxUSE_ZIPSTREAM=yes DEFAULT_wxUSE_TARSTREAM=yes - DEFAULT_wxUSE_BACKINGFILE=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -951,7 +949,6 @@ 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) WX_ARG_ENABLE(arcstream, [ --enable-arcstream use wxArchive streams], wxUSE_ARCHIVE_STREAMS) -WX_ARG_ENABLE(backingfile, [ --enable-backingfile use wxBackingFile], wxUSE_BACKINGFILE) WX_ARG_ENABLE(backtrace, [ --enable-backtrace use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER) WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION) WX_ARG_ENABLE(cmdline, [ --enable-cmdline use wxCmdLineParser class], wxUSE_CMDLINE_PARSER) @@ -967,7 +964,7 @@ WX_ARG_ENABLE(filesystem, [ --enable-filesystem use virtual file systems WX_ARG_ENABLE(fontmap, [ --enable-fontmap use font encodings conversion classes], wxUSE_FONTMAP) WX_ARG_ENABLE(fs_archive, [ --enable-fs_archive use virtual archive filesystems], wxUSE_FS_ARCHIVE) 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(fs_zip, [ --enable-fs_zip now replaced by fs_archive], wxUSE_FS_ZIP) WX_ARG_ENABLE(geometry, [ --enable-geometry use geometry class], wxUSE_GEOMETRY) WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG) WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) @@ -5717,17 +5714,10 @@ if test "$wxUSE_FFILE" = "yes"; then AC_DEFINE(wxUSE_FFILE) fi -if test "$wxUSE_FILESYSTEM" = "yes"; then - AC_DEFINE(wxUSE_FILESYSTEM) -fi - -if test "$wxUSE_FS_ZIP" = "yes"; then - AC_DEFINE(wxUSE_FS_ZIP) -fi - if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then if test "$wxUSE_STREAMS" != yes; then AC_MSG_WARN(wxArchive requires wxStreams... disabled) + wxUSE_ARCHIVE_STREAMS=no else AC_DEFINE(wxUSE_ARCHIVE_STREAMS) fi @@ -5751,22 +5741,31 @@ if test "$wxUSE_TARSTREAM" = "yes"; then fi fi -if test "$wxUSE_BACKINGFILE" = "yes"; then +if test "$wxUSE_FILESYSTEM" = "yes"; then if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then - AC_MSG_WARN(wxBackingFile requires wxStreams and wxFile or wxFFile... disabled) + AC_MSG_WARN(wxFileSystem requires wxStreams and wxFile or wxFFile... disabled) + wxUSE_FILESYSTEM=no else - AC_DEFINE(wxUSE_BACKINGFILE) + AC_DEFINE(wxUSE_FILESYSTEM) fi fi if test "$wxUSE_FS_ARCHIVE" = "yes"; then - if test "$wxUSE_ARCHIVE_STREAMS" != yes -o "$wxUSE_BACKINGFILE" != yes; then - AC_MSG_WARN(wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled) + if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then + AC_MSG_WARN(wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled) else AC_DEFINE(wxUSE_FS_ARCHIVE) fi fi +if test "$wxUSE_FS_ZIP" = "yes"; then + if test "$wxUSE_FS_ARCHIVE" != yes; then + AC_MSG_WARN(wxZipFSHandler requires wxArchiveFSHandler... disabled) + else + AC_DEFINE(wxUSE_FS_ZIP) + fi +fi + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then if test "$USE_UNIX" != 1; then AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called]) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 20ff0d9..600ad94 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -83,14 +83,6 @@ please keep the options in alphabetical order! */ -#ifndef wxUSE_BACKINGFILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BACKINGFILE must be defined." -# else -# define wxUSE_BACKINGFILE 0 -# endif -#endif /* !defined(wxUSE_BACKINGFILE) */ - #ifndef wxUSE_CRASHREPORT /* this one is special: as currently it is Windows-only, don't force it to be defined on other platforms */ @@ -1059,6 +1051,25 @@ # endif #endif /* wxUSE_HTML */ +#if wxUSE_FS_ARCHIVE +# if !wxUSE_FILESYSTEM +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxArchiveFSHandler requires wxFileSystem" +# else +# undef wxUSE_FILESYSTEM +# define wxUSE_FILESYSTEM 1 +# endif +# endif +# if !wxUSE_ARCHIVE_STREAMS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxArchiveFSHandler requires wxArchive" +# else +# undef wxUSE_ARCHIVE_STREAMS +# define wxUSE_ARCHIVE_STREAMS 1 +# endif +# endif +#endif /* wxUSE_FS_ARCHIVE */ + #if wxUSE_FILESYSTEM # if !wxUSE_STREAMS # ifdef wxABORT_ON_CONFIG_ERROR @@ -1072,8 +1083,10 @@ # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE" # else -# undef wxUSE_FILESYSTEM -# define wxUSE_FILESYSTEM 0 +# undef wxUSE_FILE +# define wxUSE_FILE 1 +# undef wxUSE_FFILE +# define wxUSE_FFILE 1 # endif # endif #endif /* wxUSE_FILESYSTEM */ @@ -1176,38 +1189,6 @@ # endif #endif /* wxUSE_ZIPSTREAM */ -#if wxUSE_FS_ARCHIVE -# if !wxUSE_ARCHIVE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxArchiveFSHandler requires wxArchive and wxBackingFile" -# else -# undef wxUSE_ARCHIVE_STREAMS -# define wxUSE_ARCHIVE_STREAMS 1 -# undef wxUSE_BACKINGFILE -# define wxUSE_BACKINGFILE 1 -# endif -# endif -#endif /* wxUSE_FS_ARCHIVE */ - -#if wxUSE_BACKINGFILE -# if !wxUSE_STREAMS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxBackingFile requires wxStream" -# else -# undef wxUSE_STREAMS -# define wxUSE_STREAMS 1 -# endif -# endif -# if !wxUSE_FILE && !wxUSE_FFILE -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxBackingFile requires wxFile or wxFFile" -# else -# undef wxUSE_FFILE -# define wxUSE_FFILE 1 -# endif -# endif -#endif /* wxUSE_BACKINGFILE */ - #if wxUSE_TARSTREAM # if !wxUSE_ARCHIVE_STREAMS # ifdef wxABORT_ON_CONFIG_ERROR diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h dissimilarity index 80% index e98b3f8..ae3849b 100644 --- a/include/wx/fs_zip.h +++ b/include/wx/fs_zip.h @@ -1,56 +1,23 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: fs_zip.h -// Purpose: ZIP file system -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// CVS-ID: $Id$ -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FS_ZIP_H_ -#define _WX_FS_ZIP_H_ - -#include "wx/defs.h" - -#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS - -#include "wx/filesys.h" -#include "wx/hashmap.h" - - -WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap); - - -//--------------------------------------------------------------------------- -// wxZipFSHandler -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxZipFSHandler : public wxFileSystemHandler -{ - public: - wxZipFSHandler(); - virtual bool CanOpen(const wxString& location); - virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location); - virtual wxString FindFirst(const wxString& spec, int flags = 0); - virtual wxString FindNext(); - void Cleanup(); - virtual ~wxZipFSHandler(); - - private: - // these vars are used by FindFirst/Next: - class wxZipInputStream *m_Archive; - wxString m_Pattern, m_BaseDir, m_ZipFile; - bool m_AllowDirs, m_AllowFiles; - wxZipFilenameHashMap *m_DirsFound; - - wxString DoFind(); - - DECLARE_NO_COPY_CLASS(wxZipFSHandler) -}; - - -#endif - // wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_STREAMS - -#endif // _WX_FS_ZIP_H_ - +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/fs_zip.h +// Purpose: wxZipFSHandler typedef for compatibility +// Author: Mike Wetherell +// Copyright: (c) 2006 Mike Wetherell +// CVS-ID: $Id$ +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_FS_ZIP_H_ +#define _WX_FS_ZIP_H_ + +#include "wx/defs.h" + +#if wxUSE_FS_ZIP + +#include "wx/fs_arc.h" + +typedef wxArchiveFSHandler wxZipFSHandler; + +#endif // wxUSE_FS_ZIP + +#endif // _WX_FS_ZIP_H_ diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 89c7af6..8381fdc 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -439,9 +439,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index e9d856c..a6d038c 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -438,9 +438,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index c7d6b3e..0212e27 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -438,9 +438,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index c856681..f5de075 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -438,9 +438,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index b26dec1..dfbb5f3 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -438,9 +438,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index 77ea121..a2439ed 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -438,9 +438,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/private/fileback.h b/include/wx/private/fileback.h new file mode 100644 index 0000000..8567852 --- /dev/null +++ b/include/wx/private/fileback.h @@ -0,0 +1,83 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: include/wx/private/fileback.h +// Purpose: Back an input stream with memory or a file +// Author: Mike Wetherell +// RCS-ID: $Id$ +// Copyright: (c) 2006 Mike Wetherell +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_FILEBACK_H__ +#define _WX_FILEBACK_H__ + +#include "wx/defs.h" + +#if wxUSE_FILESYSTEM + +#include "wx/stream.h" + +// ---------------------------------------------------------------------------- +// Backs an input stream with memory or a file to make it seekable. +// +// One or more wxBackedInputStreams can be used to read it's data. The data is +// reference counted, so stays alive until the last wxBackingFile or +// wxBackedInputStream using it is destroyed. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxBackingFile +{ +public: + enum { DefaultBufSize = 16384 }; + + // Takes ownership of stream. If the stream is smaller than bufsize, the + // backing file is never created and the backing is done with memory. + wxBackingFile(wxInputStream *stream, + size_t bufsize = DefaultBufSize, + const wxString& prefix = _T("wxbf")); + + wxBackingFile() : m_impl(NULL) { } + ~wxBackingFile(); + + wxBackingFile(const wxBackingFile& backer); + wxBackingFile& operator=(const wxBackingFile& backer); + + operator bool() const { return m_impl != NULL; } + +private: + class wxBackingFileImpl *m_impl; + friend class wxBackedInputStream; +}; + +// ---------------------------------------------------------------------------- +// An input stream to read from a wxBackingFile. +// ---------------------------------------------------------------------------- + +class WXDLLIMPEXP_BASE wxBackedInputStream : public wxInputStream +{ +public: + wxBackedInputStream(const wxBackingFile& backer); + + // If the length of the backer's parent stream is unknown then GetLength() + // returns wxInvalidOffset until the parent has been read to the end. + wxFileOffset GetLength() const; + + // Returns the length, reading the parent stream to the end if necessary. + wxFileOffset FindLength() const; + + bool IsSeekable() const { return true; } + +protected: + size_t OnSysRead(void *buffer, size_t size); + wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode); + wxFileOffset OnSysTell() const; + +private: + wxBackingFile m_backer; + wxFileOffset m_pos; + + DECLARE_NO_COPY_CLASS(wxBackedInputStream) +}; + +#endif // wxUSE_FILESYSTEM + +#endif // _WX_FILEBACK_H__ diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 9de20b6..3ea12f5 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -434,9 +434,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 6cce042..1c5df99 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -444,9 +444,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 diff --git a/setup.h.in b/setup.h.in index 8081e1b..1df5f82 100644 --- a/setup.h.in +++ b/setup.h.in @@ -253,8 +253,6 @@ #define wxUSE_ZIPSTREAM 0 -#define wxUSE_BACKINGFILE 0 - #define wxUSE_TARSTREAM 0 #define wxUSE_ZLIB 0 diff --git a/setup.h_vms b/setup.h_vms index 25f9f28..4dcc4f3 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -270,8 +270,6 @@ typedef pid_t GPid; #define wxUSE_TARSTREAM 1 -#define wxUSE_BACKINGFILE 1 - #define wxUSE_ZLIB 1 #define wxUSE_APPLE_IEEE 0 diff --git a/src/common/fileback.cpp b/src/common/fileback.cpp index bc5f2ff..6e4253c 100644 --- a/src/common/fileback.cpp +++ b/src/common/fileback.cpp @@ -14,9 +14,9 @@ #pragma hdrstop #endif -#if wxUSE_BACKINGFILE +#if wxUSE_FILESYSTEM -#include "wx/fileback.h" +#include "wx/private/fileback.h" #ifndef WX_PRECOMP #include "wx/utils.h" @@ -335,4 +335,4 @@ wxFileOffset wxBackedInputStream::OnSysTell() const return m_pos; } -#endif // wxUSE_BACKINGFILE +#endif // wxUSE_FILESYSTEM diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 43c1ff9..c045f5e 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -27,7 +27,7 @@ #include "wx/mimetype.h" #include "wx/filename.h" #include "wx/tokenzr.h" -#include "wx/fileback.h" +#include "wx/private/fileback.h" //-------------------------------------------------------------------------------- diff --git a/src/common/fs_arc.cpp b/src/common/fs_arc.cpp index c69153c..357c2f7 100644 --- a/src/common/fs_arc.cpp +++ b/src/common/fs_arc.cpp @@ -23,8 +23,7 @@ #endif #include "wx/archive.h" -#include "wx/fileback.h" -#include "wx/thread.h" +#include "wx/private/fileback.h" //--------------------------------------------------------------------------- // wxArchiveFSCacheDataImpl diff --git a/src/common/fs_zip.cpp b/src/common/fs_zip.cpp deleted file mode 100644 index f96f1b8..0000000 --- a/src/common/fs_zip.cpp +++ /dev/null @@ -1,256 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: fs_zip.cpp -// Purpose: ZIP file system -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// CVS-ID: $Id$ -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#if wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM && wxUSE_ZLIB - -#ifndef WXPRECOMP - #include "wx/intl.h" - #include "wx/log.h" -#endif - -#include "wx/filesys.h" -#include "wx/wfstream.h" -#include "wx/zipstrm.h" -#include "wx/fs_zip.h" - - -//--------------------------------------------------------------------------- -// wxZipFSInputStream -//--------------------------------------------------------------------------- -// Helper class for wxZipFSHandler - -class wxZipFSInputStream : public wxZipInputStream -{ - public: - wxZipFSInputStream(wxFSFile *file) - : wxZipInputStream(*file->GetStream()) - { - m_file = file; -#if WXWIN_COMPATIBILITY_2_6 - m_allowSeeking = true; -#endif - } - - virtual ~wxZipFSInputStream() { delete m_file; } - - private: - wxFSFile *m_file; -}; - -//---------------------------------------------------------------------------- -// wxZipFSHandler -//---------------------------------------------------------------------------- - -wxZipFSHandler::wxZipFSHandler() : wxFileSystemHandler() -{ - m_Archive = NULL; - m_ZipFile = m_Pattern = m_BaseDir = wxEmptyString; - m_AllowDirs = m_AllowFiles = true; - m_DirsFound = NULL; -} - - - -wxZipFSHandler::~wxZipFSHandler() -{ - Cleanup(); -} - - -void wxZipFSHandler::Cleanup() -{ - wxDELETE(m_Archive); - wxDELETE(m_DirsFound); -} - - - -bool wxZipFSHandler::CanOpen(const wxString& location) -{ - wxString p = GetProtocol(location); - return (p == wxT("zip")); -} - - -wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) -{ - wxString right = GetRightLocation(location); - wxString left = GetLeftLocation(location); - wxZipInputStream *s; - - if (right.Contains(wxT("./"))) - { - if (right.GetChar(0) != wxT('/')) right = wxT('/') + right; - wxFileName rightPart(right, wxPATH_UNIX); - rightPart.Normalize(wxPATH_NORM_DOTS, wxT("/"), wxPATH_UNIX); - right = rightPart.GetFullPath(wxPATH_UNIX); - } - - if (right.GetChar(0) == wxT('/')) right = right.Mid(1); - - // a new wxFileSystem object is needed here to avoid infinite recursion - wxFSFile *leftFile = wxFileSystem().OpenFile(left); - if (!leftFile) - return NULL; - - s = new wxZipFSInputStream(leftFile); - if (s && s->IsOk()) - { -#if wxUSE_DATETIME - wxDateTime dtMod; -#endif // wxUSE_DATETIME - - bool found = false; - while (!found) - { - wxZipEntry *ent = s->GetNextEntry(); - if (!ent) - break; - - if (ent->GetInternalName() == right) - { - found = true; - dtMod = ent->GetDateTime(); - } - - delete ent; - } - if (found) - { - return new wxFSFile(s, - left + wxT("#zip:") + right, - GetMimeTypeFromExt(location), - GetAnchor(location) -#if wxUSE_DATETIME - , dtMod -#endif // wxUSE_DATETIME - ); - } - } - - delete s; - return NULL; -} - - - -wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags) -{ - wxString right = GetRightLocation(spec); - wxString left = GetLeftLocation(spec); - - if (!right.empty() && right.Last() == wxT('/')) right.RemoveLast(); - - if (m_Archive) - { - delete m_Archive; - m_Archive = NULL; - } - - switch (flags) - { - case wxFILE: - m_AllowDirs = false, m_AllowFiles = true; break; - case wxDIR: - m_AllowDirs = true, m_AllowFiles = false; break; - default: - m_AllowDirs = m_AllowFiles = true; break; - } - - m_ZipFile = left; - - wxFSFile *leftFile = wxFileSystem().OpenFile(left); - if (leftFile) - m_Archive = new wxZipFSInputStream(leftFile); - - m_Pattern = right.AfterLast(wxT('/')); - m_BaseDir = right.BeforeLast(wxT('/')); - if (m_BaseDir.StartsWith(wxT("/"))) - m_BaseDir = m_BaseDir.Mid(1); - - if (m_Archive) - { - if (m_AllowDirs) - { - delete m_DirsFound; - m_DirsFound = new wxZipFilenameHashMap(); - if (right.empty()) // allow "/" to match the archive root - return spec; - } - return DoFind(); - } - return wxEmptyString; -} - - - -wxString wxZipFSHandler::FindNext() -{ - if (!m_Archive) return wxEmptyString; - return DoFind(); -} - - - -wxString wxZipFSHandler::DoFind() -{ - wxString namestr, dir, filename; - wxString match = wxEmptyString; - - while (match == wxEmptyString) - { - wxZipEntry *entry = m_Archive->GetNextEntry(); - if (!entry) - { - delete m_Archive; - m_Archive = NULL; - break; - } - namestr = entry->GetName(wxPATH_UNIX); - delete entry; - - if (m_AllowDirs) - { - dir = namestr.BeforeLast(wxT('/')); - while (!dir.empty()) - { - if( m_DirsFound->find(dir) == m_DirsFound->end() ) - { - (*m_DirsFound)[dir] = 1; - filename = dir.AfterLast(wxT('/')); - dir = dir.BeforeLast(wxT('/')); - if (!filename.empty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, false)) - match = m_ZipFile + wxT("#zip:") + dir + wxT("/") + filename; - } - else - break; // already tranversed - } - } - - filename = namestr.AfterLast(wxT('/')); - dir = namestr.BeforeLast(wxT('/')); - if (m_AllowFiles && !filename.empty() && m_BaseDir == dir && - wxMatchWild(m_Pattern, filename, false)) - match = m_ZipFile + wxT("#zip:") + namestr; - } - - return match; -} - - - -#endif - //wxUSE_FILESYSTEM && wxUSE_FS_ZIP && wxUSE_ZIPSTREAM diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 83cee20..6c557b8 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -607,10 +607,6 @@ SOURCE=.\common\fs_mem.cpp # End Source File # Begin Source File -SOURCE=.\common\fs_zip.cpp -# End Source File -# Begin Source File - SOURCE=.\common\ftp.cpp # End Source File # Begin Source File @@ -2639,10 +2635,6 @@ SOURCE=..\include\wx\file.h # End Source File # Begin Source File -SOURCE=..\include\wx\fileback.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\fileconf.h # End Source File # Begin Source File diff --git a/wxGTK.spec b/wxGTK.spec index f671637..67a0ee2 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -240,7 +240,6 @@ wx/except.h wx/features.h wx/ffile.h wx/file.h -wx/fileback.h wx/fileconf.h wx/filefn.h wx/filename.h diff --git a/wxMotif.spec b/wxMotif.spec index bcc90cd..f6d8e49 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -143,7 +143,6 @@ wx/except.h wx/features.h wx/ffile.h wx/file.h -wx/fileback.h wx/fileconf.h wx/filefn.h wx/filename.h diff --git a/wxX11.spec b/wxX11.spec index 4f0baaf..7606cd9 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -168,7 +168,6 @@ wx/except.h wx/features.h wx/ffile.h wx/file.h -wx/fileback.h wx/fileconf.h wx/filefn.h wx/filename.h -- 2.7.4