Add generic wxFileSystem support to wxWebView using wxWebViewFSHandler.

Closes #14623.

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

diff --git a/Makefile.in b/Makefile.in
index 5c12369a96aea32e99f9e05ac488466206fe124f..e6c0c028d04e3f277f6caee8995b95fe589e0a45 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1646,7 +1646,8 @@ WEBVIEWDLL_OBJECTS =  \
        $(__webviewdll___win32rc) \
        $(__WEBVIEW_SRC_PLATFORM_OBJECTS_2) \
        webviewdll_webview.o \
-       webviewdll_webviewarchivehandler.o
+       webviewdll_webviewarchivehandler.o \
+       webviewdll_webviewfshandler.o
 WEBVIEWDLL_ODEP =  $(_____pch_wxprec_webviewdll_wx_wxprec_h_gch___depname)
 WEBVIEWLIB_CXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
        $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1661,7 +1662,8 @@ WEBVIEWLIB_OBJCXXFLAGS = $(__webviewlib_PCH_INC) -D__WX$(TOOLKIT)__ \
 WEBVIEWLIB_OBJECTS =  \
        $(__WEBVIEW_SRC_PLATFORM_OBJECTS_3) \
        webviewlib_webview.o \
-       webviewlib_webviewarchivehandler.o
+       webviewlib_webviewarchivehandler.o \
+       webviewlib_webviewfshandler.o
 WEBVIEWLIB_ODEP =  $(_____pch_wxprec_webviewlib_wx_wxprec_h_gch___depname)
 QADLL_CXXFLAGS = $(__qadll_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -4381,7 +4383,8 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
        wx/stc/stc.h \
        $(WEBVIEW_HDR_PLATFORM) \
        wx/webview.h \
-       wx/webviewarchivehandler.h
+       wx/webviewarchivehandler.h \
+       wx/webviewfshandler.h
 @COND_USE_GUI_1@ALL_GUI_HEADERS = $(COND_USE_GUI_1_ALL_GUI_HEADERS)
 COND_MONOLITHIC_1_SHARED_1___monodll___depname = \
        $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
@@ -4582,6 +4585,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
        $(__WEBVIEW_SRC_PLATFORM_OBJECTS) \
        monodll_webview.o \
        monodll_webviewarchivehandler.o \
+       monodll_webviewfshandler.o \
        monodll_debugrpt.o \
        monodll_dbgrptg.o \
        monodll_xh_animatctrl.o \
@@ -6787,6 +6791,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        $(__WEBVIEW_SRC_PLATFORM_OBJECTS_1) \
        monolib_webview.o \
        monolib_webviewarchivehandler.o \
+       monolib_webviewfshandler.o \
        monolib_debugrpt.o \
        monolib_dbgrptg.o \
        monolib_xh_animatctrl.o \
@@ -18228,6 +18233,9 @@ monodll_webview.o: $(srcdir)/src/common/webview.cpp $(MONODLL_ODEP)
 monodll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
 
+monodll_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(MONODLL_ODEP)
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp
+
 monodll_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONODLL_ODEP)
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
 
@@ -23922,6 +23930,9 @@ monolib_webview.o: $(srcdir)/src/common/webview.cpp $(MONOLIB_ODEP)
 monolib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
 
+monolib_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(MONOLIB_ODEP)
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp
+
 monolib_debugrpt.o: $(srcdir)/src/common/debugrpt.cpp $(MONOLIB_ODEP)
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/debugrpt.cpp
 
@@ -38766,6 +38777,9 @@ webviewdll_webview.o: $(srcdir)/src/common/webview.cpp $(WEBVIEWDLL_ODEP)
 webviewdll_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(WEBVIEWDLL_ODEP)
        $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
 
+webviewdll_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(WEBVIEWDLL_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp
+
 webviewlib_webview_ie.o: $(srcdir)/src/msw/webview_ie.cpp $(WEBVIEWLIB_ODEP)
        $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/msw/webview_ie.cpp
 
@@ -38781,6 +38795,9 @@ webviewlib_webview.o: $(srcdir)/src/common/webview.cpp $(WEBVIEWLIB_ODEP)
 webviewlib_webviewarchivehandler.o: $(srcdir)/src/common/webviewarchivehandler.cpp $(WEBVIEWLIB_ODEP)
        $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webviewarchivehandler.cpp
 
+webviewlib_webviewfshandler.o: $(srcdir)/src/common/webviewfshandler.cpp $(WEBVIEWLIB_ODEP)
+       $(CXXC) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(srcdir)/src/common/webviewfshandler.cpp
+
 qadll_version_rc.o: $(srcdir)/src/msw/version.rc $(QADLL_ODEP)
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66)  $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65)   --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_QA
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index ea2ad18d888ed69dd1c393ebe5594b4873671891..5ff127e9e4de29c0f72fd36d61ebcbc60843e422 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3345,6 +3345,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_SRC_PLATFORM)
     src/common/webview.cpp
     src/common/webviewarchivehandler.cpp
+    src/common/webviewfshandler.cpp
 </set>
 
 <set var="WEBVIEW_HDR_PLATFORM" hints="files">
@@ -3366,6 +3367,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     $(WEBVIEW_HDR_PLATFORM)
     wx/webview.h
     wx/webviewarchivehandler.h
+    wx/webviewfshandler.h
 </set>
 
 <!-- ====================================================================== -->

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index c4b2d920850e8d64ddc4ad64401445e02ccd3cf7..0a40aceed1aa3d56d0c8b49495192975a7f2c444 100644 (file)
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1106,7 +1106,8 @@ WEBVIEWDLL_OBJECTS =  \
        $(OBJS)\webviewdll_dummy.obj \\r
        $(OBJS)\webviewdll_webview_ie.obj \\r
        $(OBJS)\webviewdll_webview.obj \\r
-       $(OBJS)\webviewdll_webviewarchivehandler.obj\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
 WEBVIEWLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
@@ -1120,7 +1121,8 @@ WEBVIEWLIB_OBJECTS =  \
        $(OBJS)\webviewlib_dummy.obj \\r
        $(OBJS)\webviewlib_webview_ie.obj \\r
        $(OBJS)\webviewlib_webview.obj \\r
-       $(OBJS)\webviewlib_webviewarchivehandler.obj\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
 QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
        $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
@@ -1643,6 +1645,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_webview_ie.obj \\r
        $(OBJS)\monodll_webview.obj \\r
        $(OBJS)\monodll_webviewarchivehandler.obj \\r
+       $(OBJS)\monodll_webviewfshandler.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
        $(OBJS)\monodll_dbgrptg.obj \\r
        $(OBJS)\monodll_xh_animatctrl.obj \\r
@@ -2077,7 +2080,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \\r
        $(OBJS)\monodll_automtn.obj \\r
        $(OBJS)\monodll_uuid.obj \\r
-       $(OBJS)\monodll_evtloop.obj \
+       $(OBJS)\monodll_evtloop.obj \\r
        $(OBJS)\monodll_generic_accel.obj \\r
        $(OBJS)\monodll_clrpickerg.obj \\r
        $(OBJS)\monodll_collpaneg.obj \\r
@@ -2431,6 +2434,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_webview_ie.obj \\r
        $(OBJS)\monolib_webview.obj \\r
        $(OBJS)\monolib_webviewarchivehandler.obj \\r
+       $(OBJS)\monolib_webviewfshandler.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
        $(OBJS)\monolib_dbgrptg.obj \\r
        $(OBJS)\monolib_xh_animatctrl.obj \\r
@@ -2865,7 +2869,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \\r
        $(OBJS)\monolib_automtn.obj \\r
        $(OBJS)\monolib_uuid.obj \\r
-       $(OBJS)\monolib_evtloop.obj \
+       $(OBJS)\monolib_evtloop.obj \\r
        $(OBJS)\monolib_generic_accel.obj \\r
        $(OBJS)\monolib_clrpickerg.obj \\r
        $(OBJS)\monolib_collpaneg.obj \\r
@@ -3535,7 +3539,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \\r
        $(OBJS)\coredll_automtn.obj \\r
        $(OBJS)\coredll_uuid.obj \\r
-       $(OBJS)\coredll_evtloop.obj \
+       $(OBJS)\coredll_evtloop.obj \\r
        $(OBJS)\coredll_generic_accel.obj \\r
        $(OBJS)\coredll_clrpickerg.obj \\r
        $(OBJS)\coredll_collpaneg.obj \\r
@@ -4081,7 +4085,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \\r
        $(OBJS)\corelib_automtn.obj \\r
        $(OBJS)\corelib_uuid.obj \\r
-       $(OBJS)\corelib_evtloop.obj \
+       $(OBJS)\corelib_evtloop.obj \\r
        $(OBJS)\corelib_generic_accel.obj \\r
        $(OBJS)\corelib_clrpickerg.obj \\r
        $(OBJS)\corelib_collpaneg.obj \\r
@@ -5417,20 +5421,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
-       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=bcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
@@ -6949,6 +6953,9 @@ $(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -7556,11 +7563,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -9367,6 +9374,9 @@ $(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -9974,11 +9984,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -12359,11 +12369,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -13774,11 +13784,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -15089,6 +15099,9 @@ $(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
 \r
@@ -15101,6 +15114,9 @@ $(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp\r
 \r

diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index dc211b2e71b05d5e5e4aa55ad3310e41b266ee61..ae37b9d80b684d2bddf75749e7a229a2a79ff1fa 100644 (file)
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1103,7 +1103,8 @@ WEBVIEWDLL_OBJECTS =  \
        $(OBJS)\webviewdll_version_rc.o \\r
        $(OBJS)\webviewdll_webview_ie.o \\r
        $(OBJS)\webviewdll_webview.o \\r
-       $(OBJS)\webviewdll_webviewarchivehandler.o\r
+       $(OBJS)\webviewdll_webviewarchivehandler.o \\r
+       $(OBJS)\webviewdll_webviewfshandler.o\r
 WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
@@ -1117,7 +1118,8 @@ WEBVIEWLIB_OBJECTS =  \
        $(OBJS)\webviewlib_dummy.o \\r
        $(OBJS)\webviewlib_webview_ie.o \\r
        $(OBJS)\webviewlib_webview.o \\r
-       $(OBJS)\webviewlib_webviewarchivehandler.o\r
+       $(OBJS)\webviewlib_webviewarchivehandler.o \\r
+       $(OBJS)\webviewlib_webviewfshandler.o\r
 QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
@@ -1655,6 +1657,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_webview_ie.o \\r
        $(OBJS)\monodll_webview.o \\r
        $(OBJS)\monodll_webviewarchivehandler.o \\r
+       $(OBJS)\monodll_webviewfshandler.o \\r
        $(OBJS)\monodll_debugrpt.o \\r
        $(OBJS)\monodll_dbgrptg.o \\r
        $(OBJS)\monodll_xh_animatctrl.o \\r
@@ -2092,7 +2095,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.o \\r
        $(OBJS)\monodll_automtn.o \\r
        $(OBJS)\monodll_uuid.o \\r
-       $(OBJS)\monodll_evtloop.o \
+       $(OBJS)\monodll_evtloop.o \\r
        $(OBJS)\monodll_generic_accel.o \\r
        $(OBJS)\monodll_clrpickerg.o \\r
        $(OBJS)\monodll_collpaneg.o \\r
@@ -2449,6 +2452,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_webview_ie.o \\r
        $(OBJS)\monolib_webview.o \\r
        $(OBJS)\monolib_webviewarchivehandler.o \\r
+       $(OBJS)\monolib_webviewfshandler.o \\r
        $(OBJS)\monolib_debugrpt.o \\r
        $(OBJS)\monolib_dbgrptg.o \\r
        $(OBJS)\monolib_xh_animatctrl.o \\r
@@ -2886,7 +2890,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.o \\r
        $(OBJS)\monolib_automtn.o \\r
        $(OBJS)\monolib_uuid.o \\r
-       $(OBJS)\monolib_evtloop.o \
+       $(OBJS)\monolib_evtloop.o \\r
        $(OBJS)\monolib_generic_accel.o \\r
        $(OBJS)\monolib_clrpickerg.o \\r
        $(OBJS)\monolib_collpaneg.o \\r
@@ -3572,7 +3576,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.o \\r
        $(OBJS)\coredll_automtn.o \\r
        $(OBJS)\coredll_uuid.o \\r
-       $(OBJS)\coredll_evtloop.o \
+       $(OBJS)\coredll_evtloop.o \\r
        $(OBJS)\coredll_generic_accel.o \\r
        $(OBJS)\coredll_clrpickerg.o \\r
        $(OBJS)\coredll_collpaneg.o \\r
@@ -4126,7 +4130,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.o \\r
        $(OBJS)\corelib_automtn.o \\r
        $(OBJS)\corelib_uuid.o \\r
-       $(OBJS)\corelib_evtloop.o \
+       $(OBJS)\corelib_evtloop.o \\r
        $(OBJS)\corelib_generic_accel.o \\r
        $(OBJS)\corelib_clrpickerg.o \\r
        $(OBJS)\corelib_collpaneg.o \\r
@@ -5586,20 +5590,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
-       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=gcc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
@@ -7118,6 +7122,9 @@ $(OBJS)\monodll_webview.o: ../../src/common/webview.cpp
 $(OBJS)\monodll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\monodll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -7725,11 +7732,11 @@ $(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp
-       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_accelcmn.o: ../../src/common/accelcmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
@@ -9536,6 +9543,9 @@ $(OBJS)\monolib_webview.o: ../../src/common/webview.cpp
 $(OBJS)\monolib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\monolib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -10143,11 +10153,11 @@ $(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp
-       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_accelcmn.o: ../../src/common/accelcmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
@@ -12528,11 +12538,11 @@ $(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp
-       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_accelcmn.o: ../../src/common/accelcmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
@@ -13943,11 +13953,11 @@ $(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp
 endif\r
 \r
 ifeq ($(USE_GUI),1)\r
-$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp
-       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
-ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_accelcmn.o: ../../src/common/accelcmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
 endif\r
@@ -15258,6 +15268,9 @@ $(OBJS)\webviewdll_webview.o: ../../src/common/webview.cpp
 $(OBJS)\webviewdll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp\r
        $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\webviewdll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp\r
+       $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\webviewlib_dummy.o: ../../src/common/dummy.cpp\r
        $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -15270,6 +15283,9 @@ $(OBJS)\webviewlib_webview.o: ../../src/common/webview.cpp
 $(OBJS)\webviewlib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp\r
        $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $<\r
 \r
+$(OBJS)\webviewlib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp\r
+       $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp\r
        $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 33da3d6ae104844ef374b43edb3f345cbe9741d5..40f693e7a1e3396a54cd7e5f503b062daf5b301a 100644 (file)
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1203,7 +1203,8 @@ WEBVIEWDLL_OBJECTS =  \
        $(OBJS)\webviewdll_dummy.obj \\r
        $(OBJS)\webviewdll_webview_ie.obj \\r
        $(OBJS)\webviewdll_webview.obj \\r
-       $(OBJS)\webviewdll_webviewarchivehandler.obj\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
 WEBVIEWDLL_RESOURCES =  \\r
        $(OBJS)\webviewdll_version.res\r
 WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \\r
@@ -1223,7 +1224,8 @@ WEBVIEWLIB_OBJECTS =  \
        $(OBJS)\webviewlib_dummy.obj \\r
        $(OBJS)\webviewlib_webview_ie.obj \\r
        $(OBJS)\webviewlib_webview.obj \\r
-       $(OBJS)\webviewlib_webviewarchivehandler.obj\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj \\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
 QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \\r
        $(__DEBUGINFO) \\r
        /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb \\r
@@ -1935,6 +1937,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_webview_ie.obj \\r
        $(OBJS)\monodll_webview.obj \\r
        $(OBJS)\monodll_webviewarchivehandler.obj \\r
+       $(OBJS)\monodll_webviewfshandler.obj \\r
        $(OBJS)\monodll_debugrpt.obj \\r
        $(OBJS)\monodll_dbgrptg.obj \\r
        $(OBJS)\monodll_xh_animatctrl.obj \\r
@@ -2369,7 +2372,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_helpwin.obj \\r
        $(OBJS)\monodll_automtn.obj \\r
        $(OBJS)\monodll_uuid.obj \\r
-       $(OBJS)\monodll_evtloop.obj \
+       $(OBJS)\monodll_evtloop.obj \\r
        $(OBJS)\monodll_generic_accel.obj \\r
        $(OBJS)\monodll_clrpickerg.obj \\r
        $(OBJS)\monodll_collpaneg.obj \\r
@@ -2729,6 +2732,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_webview_ie.obj \\r
        $(OBJS)\monolib_webview.obj \\r
        $(OBJS)\monolib_webviewarchivehandler.obj \\r
+       $(OBJS)\monolib_webviewfshandler.obj \\r
        $(OBJS)\monolib_debugrpt.obj \\r
        $(OBJS)\monolib_dbgrptg.obj \\r
        $(OBJS)\monolib_xh_animatctrl.obj \\r
@@ -3163,7 +3167,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_helpwin.obj \\r
        $(OBJS)\monolib_automtn.obj \\r
        $(OBJS)\monolib_uuid.obj \\r
-       $(OBJS)\monolib_evtloop.obj \
+       $(OBJS)\monolib_evtloop.obj \\r
        $(OBJS)\monolib_generic_accel.obj \\r
        $(OBJS)\monolib_clrpickerg.obj \\r
        $(OBJS)\monolib_collpaneg.obj \\r
@@ -3899,7 +3903,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_helpwin.obj \\r
        $(OBJS)\coredll_automtn.obj \\r
        $(OBJS)\coredll_uuid.obj \\r
-       $(OBJS)\coredll_evtloop.obj \
+       $(OBJS)\coredll_evtloop.obj \\r
        $(OBJS)\coredll_generic_accel.obj \\r
        $(OBJS)\coredll_clrpickerg.obj \\r
        $(OBJS)\coredll_collpaneg.obj \\r
@@ -4451,7 +4455,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_helpwin.obj \\r
        $(OBJS)\corelib_automtn.obj \\r
        $(OBJS)\corelib_uuid.obj \\r
-       $(OBJS)\corelib_evtloop.obj \
+       $(OBJS)\corelib_evtloop.obj \\r
        $(OBJS)\corelib_generic_accel.obj \\r
        $(OBJS)\corelib_clrpickerg.obj \\r
        $(OBJS)\corelib_collpaneg.obj \\r
@@ -6101,20 +6105,20 @@ build_cfg_file: $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
-       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=vc >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
@@ -7633,6 +7637,9 @@ $(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -8240,11 +8247,11 @@ $(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -10051,6 +10058,9 @@ $(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp\r
 \r
@@ -10658,11 +10668,11 @@ $(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -13043,11 +13053,11 @@ $(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -14458,11 +14468,11 @@ $(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
-$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
-!endif
-
-!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp\r
 !endif\r
@@ -15773,6 +15783,9 @@ $(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r
@@ -15785,6 +15798,9 @@ $(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp
 $(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp\r
 \r
+$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp\r
+\r
 $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp\r
 \r

diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 395e560538aefb07b8c77f32ffca1f830cd0c90e..3f98157977b89f6f9d3b1aa931d815d38986940a 100644 (file)
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -149,6 +149,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_webview_ie.obj &\r
        $(OBJS)\monodll_webview.obj &\r
        $(OBJS)\monodll_webviewarchivehandler.obj &\r
+       $(OBJS)\monodll_webviewfshandler.obj &\r
        $(OBJS)\monodll_debugrpt.obj &\r
        $(OBJS)\monodll_dbgrptg.obj &\r
        $(OBJS)\monodll_xh_animatctrl.obj &\r
@@ -587,7 +588,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_helpwin.obj &\r
        $(OBJS)\monodll_automtn.obj &\r
        $(OBJS)\monodll_uuid.obj &\r
-       $(OBJS)\monodll_evtloop.obj &
+       $(OBJS)\monodll_evtloop.obj &\r
        $(OBJS)\monodll_generic_accel.obj &\r
        $(OBJS)\monodll_clrpickerg.obj &\r
        $(OBJS)\monodll_collpaneg.obj &\r
@@ -948,6 +949,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_webview_ie.obj &\r
        $(OBJS)\monolib_webview.obj &\r
        $(OBJS)\monolib_webviewarchivehandler.obj &\r
+       $(OBJS)\monolib_webviewfshandler.obj &\r
        $(OBJS)\monolib_debugrpt.obj &\r
        $(OBJS)\monolib_dbgrptg.obj &\r
        $(OBJS)\monolib_xh_animatctrl.obj &\r
@@ -1386,7 +1388,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_helpwin.obj &\r
        $(OBJS)\monolib_automtn.obj &\r
        $(OBJS)\monolib_uuid.obj &\r
-       $(OBJS)\monolib_evtloop.obj &
+       $(OBJS)\monolib_evtloop.obj &\r
        $(OBJS)\monolib_generic_accel.obj &\r
        $(OBJS)\monolib_clrpickerg.obj &\r
        $(OBJS)\monolib_collpaneg.obj &\r
@@ -2083,7 +2085,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_helpwin.obj &\r
        $(OBJS)\coredll_automtn.obj &\r
        $(OBJS)\coredll_uuid.obj &\r
-       $(OBJS)\coredll_evtloop.obj &
+       $(OBJS)\coredll_evtloop.obj &\r
        $(OBJS)\coredll_generic_accel.obj &\r
        $(OBJS)\coredll_clrpickerg.obj &\r
        $(OBJS)\coredll_collpaneg.obj &\r
@@ -2639,7 +2641,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_helpwin.obj &\r
        $(OBJS)\corelib_automtn.obj &\r
        $(OBJS)\corelib_uuid.obj &\r
-       $(OBJS)\corelib_evtloop.obj &
+       $(OBJS)\corelib_evtloop.obj &\r
        $(OBJS)\corelib_generic_accel.obj &\r
        $(OBJS)\corelib_clrpickerg.obj &\r
        $(OBJS)\corelib_collpaneg.obj &\r
@@ -4655,7 +4657,8 @@ WEBVIEWDLL_OBJECTS =  &
        $(OBJS)\webviewdll_dummy.obj &\r
        $(OBJS)\webviewdll_webview_ie.obj &\r
        $(OBJS)\webviewdll_webview.obj &\r
-       $(OBJS)\webviewdll_webviewarchivehandler.obj\r
+       $(OBJS)\webviewdll_webviewarchivehandler.obj &\r
+       $(OBJS)\webviewdll_webviewfshandler.obj\r
 WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
@@ -4669,7 +4672,8 @@ WEBVIEWLIB_OBJECTS =  &
        $(OBJS)\webviewlib_dummy.obj &\r
        $(OBJS)\webviewlib_webview_ie.obj &\r
        $(OBJS)\webviewlib_webview.obj &\r
-       $(OBJS)\webviewlib_webviewarchivehandler.obj\r
+       $(OBJS)\webviewlib_webviewarchivehandler.obj &\r
+       $(OBJS)\webviewlib_webviewfshandler.obj\r
 QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
        $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &\r
        $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &\r
@@ -5859,20 +5863,20 @@ build_cfg_file : .SYMBOLIC $(SETUPHDIR)
        @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)\r
        @echo MSLU=0 >>$(BUILD_CFG_FILE)\r
        @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
+       @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)\r
        @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)\r
-       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)
+       @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)\r
        @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)\r
        @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)\r
        @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)\r
        @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)\r
-       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)
-       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)
-       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)
-       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)
-       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
-       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)
+       @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE)\r
+       @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE)\r
+       @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE)\r
+       @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)\r
+       @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE)\r
        @echo COMPILER=wat >>$(BUILD_CFG_FILE)\r
        @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE)\r
        @echo CC=$(CC) >>$(BUILD_CFG_FILE)\r
@@ -7391,6 +7395,9 @@ $(OBJS)\monodll_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp
 $(OBJS)\monodll_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\monodll_webviewfshandler.obj :  .AUTODEPEND ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\monodll_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 \r
@@ -7998,11 +8005,11 @@ $(OBJS)\monodll_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monodll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monodll_accelcmn.obj :  .AUTODEPEND ..\..\src\common\accelcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
 !endif\r
@@ -9809,6 +9816,9 @@ $(OBJS)\monolib_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp
 $(OBJS)\monolib_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\monolib_webviewfshandler.obj :  .AUTODEPEND ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\monolib_debugrpt.obj :  .AUTODEPEND ..\..\src\common\debugrpt.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 \r
@@ -10416,11 +10426,11 @@ $(OBJS)\monolib_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\monolib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\monolib_accelcmn.obj :  .AUTODEPEND ..\..\src\common\accelcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
 !endif\r
@@ -12801,11 +12811,11 @@ $(OBJS)\coredll_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\coredll_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\coredll_accelcmn.obj :  .AUTODEPEND ..\..\src\common\accelcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
 !endif\r
@@ -14216,11 +14226,11 @@ $(OBJS)\corelib_prntdlgg.obj :  .AUTODEPEND ..\..\src\generic\prntdlgg.cpp
 !endif\r
 \r
 !ifeq USE_GUI 1\r
-$(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp
-       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
-!ifeq USE_GUI 1
+$(OBJS)\corelib_evtloop.obj :  .AUTODEPEND ..\..\src\msw\evtloop.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
 $(OBJS)\corelib_accelcmn.obj :  .AUTODEPEND ..\..\src\common\accelcmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
 !endif\r
@@ -15531,6 +15541,9 @@ $(OBJS)\webviewdll_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp
 $(OBJS)\webviewdll_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
 \r
+$(OBJS)\webviewdll_webviewfshandler.obj :  .AUTODEPEND ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $<\r
+\r
 $(OBJS)\webviewlib_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
 \r
@@ -15543,6 +15556,9 @@ $(OBJS)\webviewlib_webview.obj :  .AUTODEPEND ..\..\src\common\webview.cpp
 $(OBJS)\webviewlib_webviewarchivehandler.obj :  .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
 \r
+$(OBJS)\webviewlib_webviewfshandler.obj :  .AUTODEPEND ..\..\src\common\webviewfshandler.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $<\r
+\r
 $(OBJS)\qadll_dummy.obj :  .AUTODEPEND ..\..\src\common\dummy.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $<\r
 \r

diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index ba9ef9f746735d659e239e0ee1678913baee8915..2940c2e60bbfd51c4569ade76123decc80f2476f 100644 (file)
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -7044,6 +7044,10 @@ SOURCE=..\..\include\wx\webviewarchivehandler.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\webviewfshandler.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\persist\window.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index dbe8a41127a2289bc7d880b9af75809bef562410..da9c7671d1abdf5bf93a422ea915c575d06f781e 100644 (file)
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -5858,6 +5858,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\webviewarchivehandler.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\persist\window.h">\r
                        </File>\r

diff --git a/build/msw/wx_vc7_webview.vcproj b/build/msw/wx_vc7_webview.vcproj
index fcf9308367b6c7c25806bd02e4bdc3aee687f71c..e48412b4f01654947fd8231b3c62fede30e71b18 100644 (file)
--- a/build/msw/wx_vc7_webview.vcproj
+++ b/build/msw/wx_vc7_webview.vcproj
@@ -585,6 +585,9 @@
                        <File\r
                                RelativePath="..\..\src\common\webviewarchivehandler.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\webviewfshandler.cpp">\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
@@ -795,6 +798,9 @@
                        <File\r
                                RelativePath="..\..\include\wx\webviewarchivehandler.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h">\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 97b17fdec62c6f8e6038fec766903f93ac4524fd..e5cb1ea721d49d16a3f19589d117e68a761ca036 100644 (file)
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -7831,6 +7831,10 @@
                                RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\persist\window.h"\r
                                >\r

diff --git a/build/msw/wx_vc8_webview.vcproj b/build/msw/wx_vc8_webview.vcproj
index ecefbc5952929cf82f9eea1e1d5d05f8dd5ee1a9..21bb33180f815a141f8e6847bc5ea79c4e477902 100644 (file)
--- a/build/msw/wx_vc8_webview.vcproj
+++ b/build/msw/wx_vc8_webview.vcproj
@@ -814,6 +814,10 @@
                                RelativePath="..\..\src\common\webviewarchivehandler.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\webviewfshandler.cpp"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
@@ -1082,6 +1086,10 @@
                                RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 8c6d8f843cccefd2661716f0e5f577730ee6cc68..25ca3e17bd97673c8cd590084391256c7a99f80c 100644 (file)
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -7827,6 +7827,10 @@
                                RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\persist\window.h"\r
                                >\r

diff --git a/build/msw/wx_vc9_webview.vcproj b/build/msw/wx_vc9_webview.vcproj
index 1a98f2558157ff18cfda62569da564f2bb534419..1c42e505a958c78942f8b41975564029e19fdd8d 100644 (file)
--- a/build/msw/wx_vc9_webview.vcproj
+++ b/build/msw/wx_vc9_webview.vcproj
@@ -810,6 +810,10 @@
                                RelativePath="..\..\src\common\webviewarchivehandler.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\src\common\webviewfshandler.cpp"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="MSW Sources"\r
@@ -1078,6 +1082,10 @@
                                RelativePath="..\..\include\wx\webviewarchivehandler.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\webviewfshandler.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/build/msw/wx_webview.dsp b/build/msw/wx_webview.dsp
index 6932af90eff2aadf35918815e04898c06fb3727f..a70dcd5e08b1807353e020ca02058a36ee8d5372 100644 (file)
--- a/build/msw/wx_webview.dsp
+++ b/build/msw/wx_webview.dsp
@@ -256,6 +256,10 @@ SOURCE=..\..\src\common\webview.cpp
 \r
 SOURCE=..\..\src\common\webviewarchivehandler.cpp\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\common\webviewfshandler.cpp\r
+# End Source File\r
 # End Group\r
 # Begin Group "MSW Sources"\r
 \r
@@ -560,6 +564,10 @@ SOURCE=..\..\include\wx\webview.h
 \r
 SOURCE=..\..\include\wx\webviewarchivehandler.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\include\wx\webviewfshandler.h\r
+# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/docs/changes.txt b/docs/changes.txt
index bf909d183e35465820a4f3494d5d1ae507b30068..e6bb2f0e98c65d2f806da1cac9ff6213b299c1f3 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -540,6 +540,8 @@ All (GUI):
 - Support hexadecimal numbers in wxSpinCtrl.
 - Respect window max size in wxBoxSizer (Nathan Ridge).
 - Add support for searching in wxWebView for MSW and GTK (Allonii).
+- Add generic wxFileSystem support to wxWebView with 
+  wxWebViewFSHandler (Nick Matthews).
 - Add possibility to hide and show again wxRibbonBar pages (wxBen).
 - Add wxRibbonBar pages highlighting (wxBen).
 - Add expand/collapse button to wxRibbonBar (rakeshthp).

diff --git a/include/wx/webviewfshandler.h b/include/wx/webviewfshandler.h
new file mode 100644 (file)
index 0000000..0e1705b
--- /dev/null
+++ b/include/wx/webviewfshandler.h
@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////\r
+// Name:        webviewfshandler.h\r
+// Purpose:     Custom webview handler for virtual file system\r
+// Author:      Nick Matthews\r
+// Id:          $Id$\r
+// Copyright:   (c) 2012 Steven Lamerton\r
+// Licence:     wxWindows licence\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+// Based on webviewarchivehandler.h file by Steven Lamerton\r
+\r
+#ifndef _WX_WEB_VIEW_FS_HANDLER_H_\r
+#define _WX_WEB_VIEW_FS_HANDLER_H_\r
+\r
+#include "wx/setup.h"\r
+\r
+#if wxUSE_WEBVIEW\r
+\r
+class wxFSFile;\r
+class wxFileSystem;\r
+\r
+#include "wx/webview.h"\r
+\r
+//Loads from uris such as scheme:example.html\r
+\r
+class WXDLLIMPEXP_WEBVIEW wxWebViewFSHandler : public wxWebViewHandler\r
+{\r
+public:\r
+    wxWebViewFSHandler(const wxString& scheme);\r
+    virtual ~wxWebViewFSHandler();\r
+    virtual wxFSFile* GetFile(const wxString &uri);\r
+private:\r
+    wxFileSystem* m_fileSystem;\r
+};\r
+\r
+#endif // wxUSE_WEBVIEW\r
+\r
+#endif // _WX_WEB_VIEW_FS_HANDLER_H_\r

diff --git a/interface/wx/fs_mem.h b/interface/wx/fs_mem.h
index 62793fbaef1ead60811e3b9d063b7621284e6ce4..421c0b2e413929c0a6627e3375ca7560101bb9f7 100644 (file)
--- a/interface/wx/fs_mem.h
+++ b/interface/wx/fs_mem.h
@@ -13,7 +13,7 @@
     them accessible via an URL.
 
     It is particularly suitable for storing bitmaps from resources or included XPM
-    files so that they can be used with wxHTML.
+    files so that they can be used with wxHTML or wxWebView.
 
     Filenames are prefixed with @c "memory:", e.g. @c "memory:myfile.html".
 
@@ -26,24 +26,30 @@
 
     void MyFrame::OnAbout(wxCommandEvent&)
     {
-        wxBusyCursor bcur;
         wxFileSystem::AddHandler(new wxMemoryFSHandler);
-        wxMemoryFSHandler::AddFile("logo.pcx", wxBITMAP(logo), wxBITMAP_TYPE_PCX);
+        wxMemoryFSHandler::AddFile("logo.png", wxBITMAP(logo), wxBITMAP_TYPE_PNG);
         wxMemoryFSHandler::AddFile("about.htm",
                                 "<html><body>About: "
-                                "<img src=\"memory:logo.pcx\"></body></html>");
+                                "<img src=\"memory:logo.png\"></body></html>");
 
         wxDialog dlg(this, -1, wxString(_("About")));
         wxBoxSizer *topsizer;
-        wxHtmlWindow *html;
         topsizer = new wxBoxSizer(wxVERTICAL);
-        html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition,
-                                wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
-        html->SetBorders(0);
-        html->LoadPage("memory:about.htm");
-        html->SetSize(html->GetInternalRepresentation()->GetWidth(),
-                    html->GetInternalRepresentation()->GetHeight());
-        topsizer->Add(html, 1, wxALL, 10);
+    #ifdef USE_WEBVIEW
+        wxWebView* browser = wxWebView::New(&dlg, wxID_ANY, wxWebViewDefaultURLStr,
+                                 wxDefaultPosition, wxSize(380, 160));
+        browser->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
+        browser->LoadURL("memory:about.htm");
+    #else // Use wxHtml
+        wxHtmlWindow *browser;
+        browser = new wxHtmlWindow(&dlg, -1, wxDefaultPosition,
+                                   wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
+        browser->SetBorders(0);
+        browser->LoadPage("memory:about.htm");
+        browser->SetSize(browser->GetInternalRepresentation()->GetWidth(),
+                    browser->GetInternalRepresentation()->GetHeight());
+    #endif
+        topsizer->Add(browser, 1, wxALL, 10);
         topsizer->Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
         topsizer->Add(new wxButton(&dlg, wxID_OK, "Ok"),
                     0, wxALL | wxALIGN_RIGHT, 15);
@@ -53,7 +59,7 @@
         dlg.Centre();
         dlg.ShowModal();
 
-        wxMemoryFSHandler::RemoveFile("logo.pcx");
+        wxMemoryFSHandler::RemoveFile("logo.png");
         wxMemoryFSHandler::RemoveFile("about.htm");
     }
     @endcode

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 58d1f974b8ff5dbdce36818b4e925d95586792b1..837a74a9c1180a07734fc07e97e97ac26b73c19b 100644 (file)
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -231,10 +231,13 @@ public:
     wxFSFile which represents the given url. You can then register your handler
     with RegisterHandler() it will be called for all pages and resources.
 
-    wxWebFileHandler is provided to allow the navigation of pages inside a zip
-    archive. It overrides the @c file scheme and provides support for the
-    standard @c file syntax as well as paths to archives of the form
-    @c file:///C:/example/docs.zip;protocol=zip/main.htm
+    wxWebViewFSHandler is provided to access the virtual file system encapsulated by
+    wxFileSystem. The wxMemoryFSHandler documentation gives an example of how this
+    may be used.
+
+    wxWebViewArchiveHandler is provided to allow the navigation of pages inside a zip
+    archive. It supports paths of the form:
+    @c scheme:///C:/example/docs.zip;protocol=zip/main.htm
 
     @beginEventEmissionTable{wxWebViewEvent}
     @event{EVT_WEB_VIEW_NAVIGATING(id, func)}
@@ -607,13 +610,13 @@ public:
         @param flags The flags for the search.
         @return If search phrase was not found in combination with the flags
                 then @c wxNOT_FOUND is returned. If called for the first time
-                with search phrase then the total number of results will be 
+                with search phrase then the total number of results will be
                 returned. Then for every time its called with the same search
                 phrase it will return the number of the current match.
         @note This function will restart the search if the flags
               @c wxWEB_VIEW_FIND_ENTIRE_WORD or @c wxWEB_VIEW_FIND_MATCH_CASE
               are changed, since this will require a new search. To reset the
-              search, for example reseting the highlights call the function 
+              search, for example reseting the highlights call the function
               with an empty search phrase. This always returns @c wxNOT_FOUND
               on the OSX WebKit backend.
         @since 2.9.5

diff --git a/interface/wx/webviewfshandler.h b/interface/wx/webviewfshandler.h
new file mode 100644 (file)
index 0000000..75399da
--- /dev/null
+++ b/interface/wx/webviewfshandler.h
@@ -0,0 +1,32 @@
+/////////////////////////////////////////////////////////////////////////////\r
+// Name:        webviewfshandler.h\r
+// Purpose:     interface of wxWebViewFSHandler\r
+// Author:      wxWidgets team\r
+// RCS-ID:      $Id$\r
+// Licence:     wxWindows licence\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+/**\r
+    @class wxWebViewFSHandler\r
+\r
+    A wxWebView file system handler to support standard wxFileSystem protocols\r
+    of the form <code> example:page.htm </code> The handler allows wxWebView to\r
+    use wxFileSystem in a similar fashion to its use with wxHtml.\r
+\r
+    The wxMemoryFSHandler documentation gives an example of how it may be used.\r
+\r
+    @since 2.9.5\r
+    @library{wxwebview}\r
+    @category{webview}\r
+\r
+    @see wxWebView, wxWebViewHandler, wxWebViewArchiveHandler\r
+ */\r
+class wxWebViewFSHandler : public wxWebViewHandler\r
+{\r
+public:\r
+    /**\r
+        Constructor.\r
+    */\r
+    wxWebViewFSHandler(const wxString& scheme);\r
+    virtual wxFSFile* GetFile(const wxString &uri);\r
+};\r

diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 6c0773b6fe2eb742d0e8cedbbd152176db486ed2..b15b1d811923b52e6824c8928b73d9abeae75c73 100644 (file)
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -32,9 +32,11 @@
 #include "wx/settings.h"
 #include "wx/webview.h"
 #include "wx/webviewarchivehandler.h"
+#include "wx/webviewfshandler.h"
 #include "wx/infobar.h"
 #include "wx/filesys.h"
 #include "wx/fs_arc.h"
+#include "wx/fs_mem.h"
 
 #ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
@@ -136,6 +138,7 @@ public:
     void OnDeleteSelection(wxCommandEvent& evt);
     void OnSelectAll(wxCommandEvent& evt);
     void OnLoadScheme(wxCommandEvent& evt);
+    void OnUseMemoryFS(wxCommandEvent& evt);
     void OnFind(wxCommandEvent& evt);
     void OnFindDone(wxCommandEvent& evt);
     void OnFindText(wxCommandEvent& evt);
@@ -213,6 +216,27 @@ bool WebApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
+    //Required for virtual file system archive and memory support
+    wxFileSystem::AddHandler(new wxArchiveFSHandler);
+    wxFileSystem::AddHandler(new wxMemoryFSHandler);
+
+    // Create the memory files
+    wxImage::AddHandler(new wxPNGHandler);
+    wxMemoryFSHandler::AddFile("logo.png", 
+        wxBitmap(wxlogo_xpm), wxBITMAP_TYPE_PNG);
+    wxMemoryFSHandler::AddFile("page1.htm",
+        "<html><head><title>File System Example</title>"
+        "<link rel='stylesheet' type='text/css' href='memory:test.css'>"
+        "</head><body><h1>Page 1</h1>"
+        "<p><img src='memory:logo.png'></p>"
+        "<p>Some text about <a href='memory:page2.htm'>Page 2</a>.</p></body>");
+    wxMemoryFSHandler::AddFile("page2.htm",
+        "<html><head><title>File System Example</title>"
+        "<link rel='stylesheet' type='text/css' href='memory:test.css'>"
+        "</head><body><h1>Page 2</h1>"
+        "<p><a href='memory:page1.htm'>Page 1</a> was better.</p></body>");
+    wxMemoryFSHandler::AddFile("test.css", "h1 {color: red;}");
+
     WebFrame *frame = new WebFrame(m_url);
     frame->Show();
 
@@ -222,9 +246,6 @@ bool WebApp::OnInit()
 WebFrame::WebFrame(const wxString& url) :
     wxFrame(NULL, wxID_ANY, "wxWebView Sample")
 {
-    //Required from virtual file system archive support
-    wxFileSystem::AddHandler(new wxArchiveFSHandler);
-
     // set the frame icon
     SetIcon(wxICON(sample));
     SetTitle("wxWebView Sample");
@@ -309,6 +330,8 @@ WebFrame::WebFrame(const wxString& url) :
 
     //We register the wxfs:// protocol for testing purposes
     m_browser->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewArchiveHandler("wxfs")));
+    //And the memory: file system
+    m_browser->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new wxWebViewFSHandler("memory")));
 
     SetSizer(topsizer);
 
@@ -378,6 +401,7 @@ WebFrame::WebFrame(const wxString& url) :
     editmenu->AppendSubMenu(selection, "Selection");
 
     wxMenuItem* loadscheme =  m_tools_menu->Append(wxID_ANY, _("Custom Scheme Example"));
+    wxMenuItem* usememoryfs =  m_tools_menu->Append(wxID_ANY, _("Memory File System Example"));
 
     //By default we want to handle navigation and new windows
     m_tools_handle_navigation->Check();
@@ -481,6 +505,8 @@ WebFrame::WebFrame(const wxString& url) :
             wxCommandEventHandler(WebFrame::OnSelectAll),  NULL, this );
     Connect(loadscheme->GetId(), wxEVT_COMMAND_MENU_SELECTED,
             wxCommandEventHandler(WebFrame::OnLoadScheme),  NULL, this );
+    Connect(usememoryfs->GetId(), wxEVT_COMMAND_MENU_SELECTED,
+            wxCommandEventHandler(WebFrame::OnUseMemoryFS),  NULL, this );
     Connect(m_find->GetId(), wxEVT_COMMAND_MENU_SELECTED,
             wxCommandEventHandler(WebFrame::OnFind),  NULL, this );
 
@@ -628,6 +654,11 @@ void WebFrame::OnLoadScheme(wxCommandEvent& WXUNUSED(evt))
     m_browser->LoadURL(path);
 }
 
+void WebFrame::OnUseMemoryFS(wxCommandEvent& WXUNUSED(evt))
+{
+    m_browser->LoadURL("memory:page1.htm");
+}
+
 void WebFrame::OnFind(wxCommandEvent& WXUNUSED(evt))
 {
     wxString value = m_browser->GetSelectedText();

diff --git a/src/common/webviewfshandler.cpp b/src/common/webviewfshandler.cpp
new file mode 100644 (file)
index 0000000..bf50748
--- /dev/null
+++ b/src/common/webviewfshandler.cpp
@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////\r
+// Name:        webviewfshandler.cpp\r
+// Purpose:     Custom webview handler for virtual file system\r
+// Author:      Nick Matthews\r
+// Id:          $Id$\r
+// Copyright:   (c) 2012 Steven Lamerton\r
+// Licence:     wxWindows licence\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+// For compilers that support precompilation, includes "wx.h".\r
+#include "wx/wxprec.h"\r
+\r
+#if wxUSE_WEBVIEW\r
+\r
+#if defined(__BORLANDC__)\r
+    #pragma hdrstop\r
+#endif\r
+\r
+#include "wx/webviewfshandler.h"\r
+#include "wx/filesys.h"\r
+\r
+wxWebViewFSHandler::wxWebViewFSHandler(const wxString& scheme) :\r
+                         wxWebViewHandler(scheme)\r
+{\r
+    m_fileSystem = new wxFileSystem();\r
+}\r
+\r
+wxWebViewFSHandler::~wxWebViewFSHandler()\r
+{\r
+    wxDELETE(m_fileSystem);\r
+}\r
+\r
+wxFSFile* wxWebViewFSHandler::GetFile(const wxString &uri)\r
+{\r
+    return m_fileSystem->OpenFile(uri);\r
+}\r
+\r
+#endif // wxUSE_WEBVIEW\r