From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Mon, 23 Oct 2006 15:45:51 +0000 (+0000)
Subject: Added wxBackingFile and wxBackedInputStream.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7d45ec4aa1e78166f78994a10c9e0bd64c1642db

Added wxBackingFile and wxBackedInputStream.


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

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 75f55b6ecb..da788fe1f4 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -219,6 +219,7 @@ MONODLL_OBJECTS =  \
 	$(OBJS)\monodll_extended.obj \
 	$(OBJS)\monodll_ffile.obj \
 	$(OBJS)\monodll_file.obj \
+	$(OBJS)\monodll_fileback.obj \
 	$(OBJS)\monodll_fileconf.obj \
 	$(OBJS)\monodll_filefn.obj \
 	$(OBJS)\monodll_filename.obj \
@@ -337,6 +338,7 @@ MONOLIB_OBJECTS =  \
 	$(OBJS)\monolib_extended.obj \
 	$(OBJS)\monolib_ffile.obj \
 	$(OBJS)\monolib_file.obj \
+	$(OBJS)\monolib_fileback.obj \
 	$(OBJS)\monolib_fileconf.obj \
 	$(OBJS)\monolib_filefn.obj \
 	$(OBJS)\monolib_filename.obj \
@@ -457,6 +459,7 @@ BASEDLL_OBJECTS =  \
 	$(OBJS)\basedll_extended.obj \
 	$(OBJS)\basedll_ffile.obj \
 	$(OBJS)\basedll_file.obj \
+	$(OBJS)\basedll_fileback.obj \
 	$(OBJS)\basedll_fileconf.obj \
 	$(OBJS)\basedll_filefn.obj \
 	$(OBJS)\basedll_filename.obj \
@@ -561,6 +564,7 @@ BASELIB_OBJECTS =  \
 	$(OBJS)\baselib_extended.obj \
 	$(OBJS)\baselib_ffile.obj \
 	$(OBJS)\baselib_file.obj \
+	$(OBJS)\baselib_fileback.obj \
 	$(OBJS)\baselib_fileconf.obj \
 	$(OBJS)\baselib_filefn.obj \
 	$(OBJS)\baselib_filename.obj \
@@ -4830,6 +4834,9 @@ $(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
+$(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+
 $(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 
@@ -6772,6 +6779,9 @@ $(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
+$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+
 $(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 
@@ -8717,6 +8727,9 @@ $(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
+$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
+
 $(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) $**
 
@@ -8963,6 +8976,9 @@ $(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp
 $(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
+$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
+
 $(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) $**
 
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index dd0bd996a3..d79bbed42e 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -166,6 +166,7 @@ extern LONG APIENTRY _EXPORT
 // Intel, Visual Age.
 #if defined(__WXWINCE__)
     #define wxGetOSFHandle(fd) ((HANDLE)fd)
+    #define wxOpenOSFHandle(h, flags) ((int)wxPtrToUInt(h))
 #elif defined(__CYGWIN__)
     #define wxGetOSFHandle(fd) ((HANDLE)get_osfhandle(fd))
 #elif defined(__VISUALC__) \
@@ -175,6 +176,8 @@ extern LONG APIENTRY _EXPORT
    || defined(__MINGW32__) \
    || (defined(__MWERKS__) && defined(__MSL__))
     #define wxGetOSFHandle(fd) ((HANDLE)_get_osfhandle(fd))
+    #define wxOpenOSFHandle(h, flags) (_open_osfhandle(wxPtrToUInt(h), flags))
+    #define wx_fdopen _fdopen
 #endif
 
 // close the handle in the class dtor
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 387c59a715..de7d95be3b 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -431,6 +431,9 @@
 // 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 wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1