diff --git a/build/osx/wxcarbon.xcodeproj/project.pbxproj b/build/osx/wxcarbon.xcodeproj/project.pbxproj
index ec2f62b6eb..6aad1f2f88 100644
--- a/build/osx/wxcarbon.xcodeproj/project.pbxproj
+++ b/build/osx/wxcarbon.xcodeproj/project.pbxproj
@@ -1051,6 +1051,8 @@
 		A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; };
 		A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; };
 		A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; };
+		A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; };
+		A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; };
 		A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; };
 		A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; };
 		A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; };
@@ -2148,6 +2150,7 @@
 		972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = "<group>"; };
 		975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = "<group>"; };
 		9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
+		97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = "<group>"; };
 		97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = "<group>"; };
 		9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = "<group>"; };
 		9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = anybutton.cpp; path = ../../src/osx/carbon/anybutton.cpp; sourceTree = "<group>"; };
@@ -2789,6 +2792,7 @@
 				66411D54BAD338498AC59401 /* xh_scrol.cpp */,
 				E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */,
 				8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */,
+				97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */,
 				6E855AB3AB08325980871AB4 /* xh_sizer.cpp */,
 				38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */,
 				950D51915EF83B57B5E8306F /* xh_spin.cpp */,
@@ -4592,6 +4596,7 @@
 				FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */,
 				87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */,
 				00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */,
+				A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */,
 				E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */,
 				5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */,
 				C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */,
@@ -5430,6 +5435,7 @@
 				FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */,
 				87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */,
 				00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */,
+				A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */,
 				E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */,
 				5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */,
 				C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */,
diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj
index cc013c0433..5dee5ad5a9 100644
--- a/build/osx/wxcocoa.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj
@@ -1071,6 +1071,8 @@
 		A3586433C4B1398FB1C361D7 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; };
 		A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; };
 		A36B5107860E326591940740 /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; };
+		A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; };
+		A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; };
 		A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; };
 		A3A898DA3114311EB7F02228 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; };
 		A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; };
@@ -2162,6 +2164,7 @@
 		972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = "<group>"; };
 		975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = "<group>"; };
 		9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
+		97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = "<group>"; };
 		97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = "<group>"; };
 		9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = "<group>"; };
 		98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/cocoa/gauge.mm; sourceTree = "<group>"; };
@@ -2734,6 +2737,7 @@
 				66411D54BAD338498AC59401 /* xh_scrol.cpp */,
 				E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */,
 				8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */,
+				97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */,
 				6E855AB3AB08325980871AB4 /* xh_sizer.cpp */,
 				38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */,
 				950D51915EF83B57B5E8306F /* xh_spin.cpp */,
@@ -4618,6 +4622,7 @@
 				FDE14459359334DE9FB03ED6 /* xh_scrol.cpp in Sources */,
 				87092C0C817D343DAB77E23F /* xh_scwin.cpp in Sources */,
 				00E2F82590B33BDCA1F6D0C5 /* xh_htmllbox.cpp in Sources */,
+				A39B0D7EB43137F7BA50A35D /* xh_simplebook.cpp in Sources */,
 				E1A20811148F31D289AF98B0 /* xh_sizer.cpp in Sources */,
 				5F6B4F226B473AACB7AC8DF6 /* xh_slidr.cpp in Sources */,
 				C32EF2EC1A103BC3A6254322 /* xh_spin.cpp in Sources */,
@@ -5458,6 +5463,7 @@
 				FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */,
 				87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */,
 				00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */,
+				A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */,
 				E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */,
 				5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */,
 				C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */,
diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj
index f63ead74e1..4b56294956 100644
--- a/build/osx/wxiphone.xcodeproj/project.pbxproj
+++ b/build/osx/wxiphone.xcodeproj/project.pbxproj
@@ -21,6 +21,7 @@
 		02E8F1195B653D26AAA89462 /* listbkg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5E7A77AA776B3B5CAEE3CC90 /* listbkg.cpp */; };
 		03035C5CE4BC3288A5A18424 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */; };
 		03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */; };
+		048986FB629E313EA670CD0C /* webviewfshandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */; };
 		05021BAB2C9B3C4CAD0A7C2C /* regfree.c in Sources */ = {isa = PBXBuildFile; fileRef = EEE82083BFA430D5B58F8A04 /* regfree.c */; };
 		052331773CF6362C9A6CF38E /* utils_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EED7C691150139EFA35E8EBD /* utils_osx.cpp */; };
 		056CA84179433AA48D55DA65 /* bar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FDDE855D9F83E4891362EB4 /* bar.cpp */; };
@@ -160,6 +161,7 @@
 		2CCC30C0162131DBBE9D8027 /* dobjcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */; };
 		2D4D105CA9BE3FA6995A5FFF /* tif_dumpmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */; };
 		2D60F289103837EA8925E3F1 /* dcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D1EE17722EA937E88A7F0C01 /* dcbase.cpp */; };
+		2DBF5F96CCC63F7481C26A43 /* webview_webkit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5FEECFD764E037288CE94FEB /* webview_webkit.mm */; };
 		2DF74933A90E34129F1BEF72 /* dnd_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA72410F615B3A78A6340532 /* dnd_osx.cpp */; };
 		2E059BFE8E3B3D9299D55969 /* textmeasure.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E9B31409EC6532FC83B0B957 /* textmeasure.cpp */; };
 		2E4747E0736B30569ACD5422 /* textbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 701B84EE7C043B539FF5195A /* textbuf.cpp */; };
@@ -295,6 +297,7 @@
 		5B5B8DF915D438AA9FCEB39E /* imagall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8FFDFB4D208F37569AC548B0 /* imagall.cpp */; };
 		5C3B0ED2EA973DFDBFBCC692 /* richtextctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */; };
 		5C44446AB150378696CD6B3C /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */; };
+		5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */; };
 		5F2C2A46781739D897CF293D /* xh_chckl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */; };
 		5F57C4908E5038D19D68ED7A /* gallery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3F1C1EB5C0B3302C86D91315 /* gallery.cpp */; };
 		5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */; };
@@ -314,6 +317,7 @@
 		633DD2E870263F42A8DBF9BF /* markuptext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4FC6F0AB2AC34D2B26F8ED8 /* markuptext.cpp */; };
 		63F0C8EEDF4B3641878A8B4D /* dlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9051902662BE38B3912B34EA /* dlgcmn.cpp */; };
 		63F2517EC6B2334CA825A6F9 /* layout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEB08798C70E33DDB360E563 /* layout.cpp */; };
+		64A716F87A5136F9A790EC5A /* webview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0DA80913C0E33144A42BD30F /* webview.cpp */; };
 		64DD406C453D39FEBBE66ED1 /* tif_pixarlog.c in Sources */ = {isa = PBXBuildFile; fileRef = 4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */; };
 		64F11C549E3035DF85691060 /* tif_ojpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */; };
 		652CFDD9A1C1366E99B5D6BC /* socketiohandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */; };
@@ -512,6 +516,7 @@
 		A336FD218BE63B19991CA513 /* ipcbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2C090A76B6F23E6481A27282 /* ipcbase.cpp */; };
 		A3586433C4B1398FB1C361D6 /* m_image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 548906E4E72935E48CE4AF87 /* m_image.cpp */; };
 		A36B5107860E32659194073F /* LexPython.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CC2713393AB132AA8E337AE1 /* LexPython.cxx */; };
+		A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */; };
 		A3A898DA3114311EB7F02227 /* sckstrm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D784A32C094730FEAA391A9B /* sckstrm.cpp */; };
 		A3C4D47A84E8362295867525 /* LexPOV.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 8EECA8EB93BF3C7A9CC827AD /* LexPOV.cxx */; };
 		A423177BBC0F3BE5A436B4B7 /* propgridpagestate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */; };
@@ -846,6 +851,7 @@
 		0CB2CC8E60833A6993BEA321 /* timerunx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timerunx.cpp; path = ../../src/unix/timerunx.cpp; sourceTree = "<group>"; };
 		0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colourdata.cpp; path = ../../src/common/colourdata.cpp; sourceTree = "<group>"; };
 		0D9828C9BD9633C1A8F4E0CD /* LexRebol.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexRebol.cxx; path = ../../src/stc/scintilla/lexers/LexRebol.cxx; sourceTree = "<group>"; };
+		0DA80913C0E33144A42BD30F /* webview.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webview.cpp; path = ../../src/common/webview.cpp; sourceTree = "<group>"; };
 		0E7BF9256DF533EBAE2B945E /* WordList.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = WordList.cxx; path = ../../src/stc/scintilla/lexlib/WordList.cxx; sourceTree = "<group>"; };
 		0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctrlcmn.cpp; path = ../../src/common/ctrlcmn.cpp; sourceTree = "<group>"; };
 		0EEAD9C3E180305D8899441E /* strvararg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = strvararg.cpp; path = ../../src/common/strvararg.cpp; sourceTree = "<group>"; };
@@ -1101,6 +1107,7 @@
 		5F84098A475939BB9EE87E70 /* imagbmp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagbmp.cpp; path = ../../src/common/imagbmp.cpp; sourceTree = "<group>"; };
 		5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_comboctrl.cpp; path = ../../src/xrc/xh_comboctrl.cpp; sourceTree = "<group>"; };
 		5FDE0AC63C4639E4BFD3B582 /* LexOpal.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexOpal.cxx; path = ../../src/stc/scintilla/lexers/LexOpal.cxx; sourceTree = "<group>"; };
+		5FEECFD764E037288CE94FEB /* webview_webkit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = webview_webkit.mm; path = ../../src/osx/webview_webkit.mm; sourceTree = "<group>"; };
 		5FF661188B563D27A11F5716 /* fontutil.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontutil.cpp; path = ../../src/osx/fontutil.cpp; sourceTree = "<group>"; };
 		5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = radiobut_osx.cpp; path = ../../src/osx/radiobut_osx.cpp; sourceTree = "<group>"; };
 		5FFCF47A161B3E08B19BFE14 /* jdsample.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jdsample.c; path = ../../src/jpeg/jdsample.c; sourceTree = "<group>"; };
@@ -1145,6 +1152,7 @@
 		6E855AB3AB08325980871AB4 /* xh_sizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_sizer.cpp; path = ../../src/xrc/xh_sizer.cpp; sourceTree = "<group>"; };
 		6EDDEEEC981133E8BA6A3998 /* jcapimin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jcapimin.c; path = ../../src/jpeg/jcapimin.c; sourceTree = "<group>"; };
 		6F23140777B733679D2FAAFC /* odcombocmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = odcombocmn.cpp; path = ../../src/common/odcombocmn.cpp; sourceTree = "<group>"; };
+		70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewarchivehandler.cpp; path = ../../src/common/webviewarchivehandler.cpp; sourceTree = "<group>"; };
 		701B84EE7C043B539FF5195A /* textbuf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbuf.cpp; path = ../../src/common/textbuf.cpp; sourceTree = "<group>"; };
 		7020ADB5D3E0375E875B418B /* LexA68k.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexA68k.cxx; path = ../../src/stc/scintilla/lexers/LexA68k.cxx; sourceTree = "<group>"; };
 		70E9B2C076673C87B4218A01 /* panelcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = panelcmn.cpp; path = ../../src/common/panelcmn.cpp; sourceTree = "<group>"; };
@@ -1269,6 +1277,7 @@
 		972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = rearrangectrl.cpp; path = ../../src/common/rearrangectrl.cpp; sourceTree = "<group>"; };
 		975E3B6A269434F0A069987D /* Catalogue.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Catalogue.cxx; path = ../../src/stc/scintilla/src/Catalogue.cxx; sourceTree = "<group>"; };
 		9794A709E3C036D79860CEC9 /* LexCoffeeScript.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCoffeeScript.cxx; path = ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx; sourceTree = "<group>"; };
+		97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_simplebook.cpp; path = ../../src/xrc/xh_simplebook.cpp; sourceTree = "<group>"; };
 		97FFB03FF6793506B246BAC6 /* platinfo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = platinfo.cpp; path = ../../src/common/platinfo.cpp; sourceTree = "<group>"; };
 		9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checklst_osx.cpp; path = ../../src/osx/checklst_osx.cpp; sourceTree = "<group>"; };
 		98A7F0605AAC3D28A8C9F253 /* gauge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = gauge.mm; path = ../../src/osx/iphone/gauge.mm; sourceTree = "<group>"; };
@@ -1466,6 +1475,7 @@
 		CF4F4F5211933057824B5621 /* button_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = button_osx.cpp; path = ../../src/osx/button_osx.cpp; sourceTree = "<group>"; };
 		CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexerSimple.cxx; path = ../../src/stc/scintilla/lexlib/LexerSimple.cxx; sourceTree = "<group>"; };
 		CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = menuitem_osx.cpp; path = ../../src/osx/menuitem_osx.cpp; sourceTree = "<group>"; };
+		CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = webviewfshandler.cpp; path = ../../src/common/webviewfshandler.cpp; sourceTree = "<group>"; };
 		D037EA567C253DEEA17E822B /* mousemanager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mousemanager.cpp; path = ../../src/common/mousemanager.cpp; sourceTree = "<group>"; };
 		D0817D6A1AF83608B050EBC3 /* fontmap.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fontmap.cpp; path = ../../src/common/fontmap.cpp; sourceTree = "<group>"; };
 		D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_cmdlinkbn.cpp; path = ../../src/xrc/xh_cmdlinkbn.cpp; sourceTree = "<group>"; };
@@ -1642,6 +1652,7 @@
 				2E7B4F88F81E37B4A9FF6C0F /* core */,
 				374BD863E6AD33189B7E4040 /* net */,
 				2FF0B5E0505D3AEA9A4ACF11 /* adv */,
+				62E50658BDAD369D92294F68 /* webview */,
 				5C5CD199E7573C73AE6F392D /* media */,
 				60E51BFF5CD2327483201F14 /* html */,
 				60328E6EA3793DA990E18FC1 /* xrc */,
@@ -1820,6 +1831,7 @@
 				66411D54BAD338498AC59401 /* xh_scrol.cpp */,
 				E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */,
 				8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */,
+				97C4E26489B034B6AE723D8D /* xh_simplebook.cpp */,
 				6E855AB3AB08325980871AB4 /* xh_sizer.cpp */,
 				38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */,
 				950D51915EF83B57B5E8306F /* xh_spin.cpp */,
@@ -1903,7 +1915,7 @@
 			isa = PBXGroup;
 			children = (
 				C23A03BC68833F7E8BA62CF1 /* src/xml */,
-				D957B1B354FC327288FDF9DB /* src/common */,
+				D957B1B354FC327288FDF9DC /* src/common */,
 			);
 			name = xml;
 			sourceTree = "<group>";
@@ -1928,7 +1940,7 @@
 		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
-				D957B1B354FC327288FDF9DA /* src/common */,
+				D957B1B354FC327288FDF9DB /* src/common */,
 			);
 			name = media;
 			sourceTree = "<group>";
@@ -1950,6 +1962,15 @@
 			name = html;
 			sourceTree = "<group>";
 		};
+		62E50658BDAD369D92294F68 /* webview */ = {
+			isa = PBXGroup;
+			children = (
+				F494694AB1FD30DEA2087AFD /* src/osx */,
+				D957B1B354FC327288FDF9DA /* src/common */,
+			);
+			name = webview;
+			sourceTree = "<group>";
+		};
 		64B126D857113F24BA8C4758 /* richtext */ = {
 			isa = PBXGroup;
 			children = (
@@ -2072,9 +2093,9 @@
 		816DD323A67F3B299C8F3481 /* opengl */ = {
 			isa = PBXGroup;
 			children = (
-				D957B1B354FC327288FDF9DC /* src/common */,
+				D957B1B354FC327288FDF9DD /* src/common */,
 				D1F5E5C8429235E68E4AC903 /* src/osx/iphone */,
-				F494694AB1FD30DEA2087AFD /* src/osx */,
+				F494694AB1FD30DEA2087AFE /* src/osx */,
 			);
 			name = opengl;
 			sourceTree = "<group>";
@@ -2868,7 +2889,9 @@
 		D957B1B354FC327288FDF9DA /* src/common */ = {
 			isa = PBXGroup;
 			children = (
-				C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */,
+				0DA80913C0E33144A42BD30F /* webview.cpp */,
+				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
+				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
 			);
 			name = src/common;
 			sourceTree = "<group>";
@@ -2876,12 +2899,20 @@
 		D957B1B354FC327288FDF9DB /* src/common */ = {
 			isa = PBXGroup;
 			children = (
-				4048A3523EC03409BD899BEF /* xtixml.cpp */,
+				C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */,
 			);
 			name = src/common;
 			sourceTree = "<group>";
 		};
 		D957B1B354FC327288FDF9DC /* src/common */ = {
+			isa = PBXGroup;
+			children = (
+				4048A3523EC03409BD899BEF /* xtixml.cpp */,
+			);
+			name = src/common;
+			sourceTree = "<group>";
+		};
+		D957B1B354FC327288FDF9DD /* src/common */ = {
 			isa = PBXGroup;
 			children = (
 				E08A51FA8D8A361681B07295 /* glcmn.cpp */,
@@ -2962,6 +2993,14 @@
 			sourceTree = "<group>";
 		};
 		F494694AB1FD30DEA2087AFD /* src/osx */ = {
+			isa = PBXGroup;
+			children = (
+				5FEECFD764E037288CE94FEB /* webview_webkit.mm */,
+			);
+			name = src/osx;
+			sourceTree = "<group>";
+		};
+		F494694AB1FD30DEA2087AFE /* src/osx */ = {
 			isa = PBXGroup;
 			children = (
 				FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */,
@@ -3491,6 +3530,10 @@
 				46F341B46F80376B962759F5 /* animateg.cpp in Sources */,
 				CE2C937117FE3AB599DD30B9 /* sound_osx.cpp in Sources */,
 				61FEDBF2D47A3B4E861F8296 /* sound.cpp in Sources */,
+				2DBF5F96CCC63F7481C26A43 /* webview_webkit.mm in Sources */,
+				64A716F87A5136F9A790EC5A /* webview.cpp in Sources */,
+				5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */,
+				048986FB629E313EA670CD0C /* webviewfshandler.cpp in Sources */,
 				DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */,
 				47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */,
 				BAA75384DA82370298672333 /* helpctrl.cpp in Sources */,
@@ -3561,6 +3604,7 @@
 				FDE14459359334DE9FB03ED5 /* xh_scrol.cpp in Sources */,
 				87092C0C817D343DAB77E23E /* xh_scwin.cpp in Sources */,
 				00E2F82590B33BDCA1F6D0C4 /* xh_htmllbox.cpp in Sources */,
+				A39B0D7EB43137F7BA50A35C /* xh_simplebook.cpp in Sources */,
 				E1A20811148F31D289AF98AF /* xh_sizer.cpp in Sources */,
 				5F6B4F226B473AACB7AC8DF5 /* xh_slidr.cpp in Sources */,
 				C32EF2EC1A103BC3A6254321 /* xh_spin.cpp in Sources */,