From 7c13d6bfe325def0cc694a89e04474e882727378 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 10 Aug 2014 15:43:59 +0000
Subject: [PATCH] no filepath subgroups in xcode projects

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/osx/wxcarbon.xcodeproj/project.pbxproj | 1486 +++++++----------
 build/osx/wxcocoa.xcodeproj/project.pbxproj  | 1506 +++++++-----------
 build/osx/wxiphone.xcodeproj/project.pbxproj | 1436 ++++++-----------
 3 files changed, 1616 insertions(+), 2812 deletions(-)

diff --git a/build/osx/wxcarbon.xcodeproj/project.pbxproj b/build/osx/wxcarbon.xcodeproj/project.pbxproj
index e59647306c..d9a68e6a5c 100644
--- a/build/osx/wxcarbon.xcodeproj/project.pbxproj
+++ b/build/osx/wxcarbon.xcodeproj/project.pbxproj
@@ -2606,116 +2606,19 @@
 		04311EAB76193D5593D43DBB /* aui */ = {
 			isa = PBXGroup;
 			children = (
-				98C15055598A3586BDB4FD0F /* src/aui */,
-				348F9A77CB8B315FBC81D214 /* src/xrc */,
+				26632A254717372BAA4D514D /* framemanager.cpp */,
+				BD709DEB71623974B9836D69 /* dockart.cpp */,
+				A881F49ADCF33C299B041584 /* floatpane.cpp */,
+				A298576700C33F018616E7BD /* auibook.cpp */,
+				05A4437E9697300390FDE14E /* auibar.cpp */,
+				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
+				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
+				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
+				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
 			);
 			name = aui;
 			sourceTree = "<group>";
 		};
-		1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				BB924887605E3CB388F56776 /* utils.cpp */,
-				D6DFFB06606F3D2E953CFC96 /* uma.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		1246F69B93FC33FFA06EF789 /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
-				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
-				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
-				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
-				18044326B5B13A98A49732DD /* fontdlg.cpp */,
-				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
-				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
-				757B31FCCA1F381C95B30DF8 /* app.cpp */,
-				7A3F26F539473705AA82411D /* combobox.cpp */,
-				12363D1F50FE301DAEE7F04A /* control.cpp */,
-				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
-				B17772732159304AA7312D72 /* dcclient.cpp */,
-				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
-				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
-				1C4762898E5330C28651EE73 /* graphics.cpp */,
-				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
-				C3019BA65DD73F30A865365F /* frame.cpp */,
-				B568A7364ECA30288820CCE7 /* mdi.cpp */,
-				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
-				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
-				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
-				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
-				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
-				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
-				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
-				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
-				9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */,
-				AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */,
-				926AEAA989793A2F82185627 /* button.cpp */,
-				19A5AFB993843FF0B8F75E47 /* checkbox.cpp */,
-				BCC5B7709F4C3875A3A316C3 /* choice.cpp */,
-				91C415400F0435528B9995B7 /* colordlg.cpp */,
-				5DF561FCD0C038B79C62B083 /* dialog.cpp */,
-				59255501B8053FEE8F258873 /* dirdlg.cpp */,
-				E27194D6828C3BB297B2CBAA /* dnd.cpp */,
-				D92E3EEACA2132609CA3D28F /* evtloop.cpp */,
-				7D47A353B2C63204ABDD42DE /* filedlg.cpp */,
-				1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */,
-				ABA5F3C56C8C37809F696A49 /* listbox.cpp */,
-				02A756A2887839B2900F8CAC /* listctrl_mac.cpp */,
-				EC8157AB87CE3E47A98A6190 /* menu.cpp */,
-				44806DDCE6FB305EAED41E92 /* menuitem.cpp */,
-				ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */,
-				95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */,
-				E1A75C83424B32E99AC91B2C /* notebmac.cpp */,
-				E5477A7352353CDE8D96D582 /* printdlg.cpp */,
-				59F8B419381C34A184190EA1 /* radiobut.cpp */,
-				B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */,
-				75278C04709D3482A2660DFC /* slider.cpp */,
-				A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */,
-				F8A72557C5B13F16A59980EF /* srchctrl.cpp */,
-				1B7E02F461A33397B00E9004 /* statbmp.cpp */,
-				32B2BC8A91983DDA9CC46793 /* statbox.cpp */,
-				4148D62D50863214B8479E60 /* statlmac.cpp */,
-				3A28411B852734BDA2C04165 /* stattext.cpp */,
-				F97C7436BF3B3BBEB423550D /* textctrl.cpp */,
-				71F35835D4DE34D59F924E36 /* tglbtn.cpp */,
-				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
-				5D90D0FA35833140A3CCCD94 /* tooltip.cpp */,
-				D35F1F29F9D33C2B9730D4EE /* window.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		1246F69B93FC33FFA06EF78A /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				BBF01162E86737818F704DBE /* aboutdlg.cpp */,
-				39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */,
-				A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */,
-				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
-				BACF6FE87AD337729BBB72BD /* taskbar.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		1246F69B93FC33FFA06EF78B /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				D03731D60A063988AF6AE70F /* mediactrl.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		1246F69B93FC33FFA06EF78C /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				8B6FCA050C26323893012BD6 /* glcanvas.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
 		1D56230B75893DBA8A923441 /* wxcocoa */ = {
 			isa = PBXGroup;
 			children = (
@@ -2749,290 +2652,7 @@
 			name = wxcocoa;
 			sourceTree = "<group>";
 		};
-		2ABA71836A2C3590B1615B26 /* src/expat/lib */ = {
-			isa = PBXGroup;
-			children = (
-				A92B6033D8233DB1821F193B /* xmlparse.c */,
-				59C6B9849FF6325E890942EF /* xmlrole.c */,
-				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
-			);
-			name = src/expat/lib;
-			sourceTree = "<group>";
-		};
 		2BE6C101F29D318895158F98 /* libscintilla */ = {
-			isa = PBXGroup;
-			children = (
-				6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */,
-				B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */,
-				88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */,
-			);
-			name = libscintilla;
-			sourceTree = "<group>";
-		};
-		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFB /* src/osx */,
-				AC04244D4E183DF480908047 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1121 /* src/unix */,
-				944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */,
-				1246F69B93FC33FFA06EF789 /* src/osx/carbon */,
-				84E0164052A73DE5996EA691 /* src/generic */,
-				D957B1B354FC327288FDF9D7 /* src/common */,
-				348F9A77CB8B315FBC81D212 /* src/xrc */,
-			);
-			name = core;
-			sourceTree = "<group>";
-		};
-		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D9 /* src/common */,
-				84E0164052A73DE5996EA692 /* src/generic */,
-				1246F69B93FC33FFA06EF78A /* src/osx/carbon */,
-				F494694AB1FD30DEA2087AFC /* src/osx */,
-				AC04244D4E183DF480908049 /* src/osx/core */,
-			);
-			name = adv;
-			sourceTree = "<group>";
-		};
-		318BFB22ACCA37E19A1BD431 /* src/propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				326723AEB79A305F90D6B41D /* advprops.cpp */,
-				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
-				EBED392D081335FA80523244 /* manager.cpp */,
-				58E1F571B01F34D4AB70CA18 /* property.cpp */,
-				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
-				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
-				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
-				C20E46A504113C899B9DD9B7 /* props.cpp */,
-			);
-			name = src/propgrid;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D212 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D213 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
-				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
-				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
-				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
-				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
-				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
-				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
-				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
-				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
-				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
-				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
-				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
-				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
-				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
-				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
-				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
-				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
-				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
-				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
-				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
-				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
-				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
-				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
-				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
-				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
-				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
-				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
-				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
-				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
-				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
-				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
-				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
-				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
-				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
-				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
-				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
-				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
-				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
-				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
-				F43AF44465B335479752116D /* xh_radbx.cpp */,
-				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 */,
-				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
-				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
-				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
-				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
-				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
-				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
-				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
-				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
-				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
-				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
-				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
-				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
-				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
-				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
-				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
-				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
-				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
-				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
-				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D214 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
-				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D215 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D216 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		374BD863E6AD33189B7E4040 /* net */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D8 /* src/common */,
-				CBC07D2BC2363BB4B61D1122 /* src/unix */,
-				AC04244D4E183DF480908048 /* src/osx/core */,
-			);
-			name = net;
-			sourceTree = "<group>";
-		};
-		42F504C4994C38D7A8F062F4 /* libexpat */ = {
-			isa = PBXGroup;
-			children = (
-				2ABA71836A2C3590B1615B26 /* src/expat/lib */,
-			);
-			name = libexpat;
-			sourceTree = "<group>";
-		};
-		4B7A97D6D29E3627B312E104 /* src/regex */ = {
-			isa = PBXGroup;
-			children = (
-				E433B890264339BA8DB97B1D /* regcomp.c */,
-				1482A34AC32133E4BE207223 /* regexec.c */,
-				A70C82ADB45A3FB99C420D03 /* regerror.c */,
-				EEE82083BFA430D5B58F8A04 /* regfree.c */,
-			);
-			name = src/regex;
-			sourceTree = "<group>";
-		};
-		4D98B791E17232D39944F04F /* xml */ = {
-			isa = PBXGroup;
-			children = (
-				C23A03BC68833F7E8BA62CF1 /* src/xml */,
-				D957B1B354FC327288FDF9DC /* src/common */,
-			);
-			name = xml;
-			sourceTree = "<group>";
-		};
-		4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = {
-			isa = PBXGroup;
-			children = (
-				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
-				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
-				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
-				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
-				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
-				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
-				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
-				D30617843F33310089C1F77A /* richtextstyles.cpp */,
-				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
-				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
-			);
-			name = src/richtext;
-			sourceTree = "<group>";
-		};
-		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
-			isa = PBXGroup;
-			children = (
-				A7471B15D7093D38B8649962 /* src/zlib */,
-			);
-			name = libzlib;
-			sourceTree = "<group>";
-		};
-		5C5CD199E7573C73AE6F392D /* media */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DB /* src/common */,
-				1246F69B93FC33FFA06EF78B /* src/osx/carbon */,
-			);
-			name = media;
-			sourceTree = "<group>";
-		};
-		60328E6EA3793DA990E18FC1 /* xrc */ = {
-			isa = PBXGroup;
-			children = (
-				348F9A77CB8B315FBC81D213 /* src/xrc */,
-			);
-			name = xrc;
-			sourceTree = "<group>";
-		};
-		60E51BFF5CD2327483201F14 /* html */ = {
-			isa = PBXGroup;
-			children = (
-				B8FCB2D33F3B3E30A75D7ABD /* src/html */,
-				84E0164052A73DE5996EA693 /* src/generic */,
-			);
-			name = html;
-			sourceTree = "<group>";
-		};
-		62E50658BDAD369D92294F68 /* webview */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFD /* src/osx */,
-				D957B1B354FC327288FDF9DA /* src/common */,
-			);
-			name = webview;
-			sourceTree = "<group>";
-		};
-		64B126D857113F24BA8C4758 /* richtext */ = {
-			isa = PBXGroup;
-			children = (
-				4E6B7B286B7938A3BD44A8E1 /* src/richtext */,
-				348F9A77CB8B315FBC81D216 /* src/xrc */,
-			);
-			name = richtext;
-			sourceTree = "<group>";
-		};
-		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
-			isa = PBXGroup;
-			children = (
-				C1D1DDEBCD103A95BE0B52D4 /* src/png */,
-			);
-			name = libpng;
-			sourceTree = "<group>";
-		};
-		6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */ = {
 			isa = PBXGroup;
 			children = (
 				7020ADB5D3E0375E875B418B /* LexA68k.cxx */,
@@ -3128,51 +2748,126 @@
 				1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */,
 				43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */,
 				9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */,
+				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
+				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
+				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
+				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
+				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
+				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
+				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
+				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
+				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
+				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
+				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
+				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
+				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
+				975E3B6A269434F0A069987D /* Catalogue.cxx */,
+				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
+				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
+				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
+				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
+				71DB140E670738839EC42C2B /* Document.cxx */,
+				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
+				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
+				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
+				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
+				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
+				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
+				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
+				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
+				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
+				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
+				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
+				C28429A964C337A192D76CC8 /* Style.cxx */,
+				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
+				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
+				C25521AF59B9324EB2809C73 /* XPM.cxx */,
 			);
-			name = src/stc/scintilla/lexers;
+			name = libscintilla;
 			sourceTree = "<group>";
 		};
-		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
-			isa = PBXGroup;
-			children = (
-				D85137B3D94F34B6B3686909 /* src/jpeg */,
-			);
-			name = libjpeg;
-			sourceTree = "<group>";
-		};
-		816DD323A67F3B299C8F3481 /* opengl */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DD /* src/common */,
-				1246F69B93FC33FFA06EF78C /* src/osx/carbon */,
-				F494694AB1FD30DEA2087AFE /* src/osx */,
-			);
-			name = opengl;
-			sourceTree = "<group>";
-		};
-		83F62FA47C9636169F1E18E8 /* base */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D6 /* src/common */,
-				84E0164052A73DE5996EA690 /* src/generic */,
-				AC04244D4E183DF480908046 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1120 /* src/unix */,
-				1246F69B93FC33FFA06EF788 /* src/osx/carbon */,
-			);
-			name = base;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA690 /* src/generic */ = {
-			isa = PBXGroup;
-			children = (
-				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
-			);
-			name = src/generic;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA691 /* src/generic */ = {
+		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
 			isa = PBXGroup;
 			children = (
+				B0665A40F3FC3F218074C63C /* artmac.cpp */,
+				302A13BC64C238A297F4399F /* brush.cpp */,
+				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
+				5FF661188B563D27A11F5716 /* fontutil.cpp */,
+				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
+				693F731B7D1730A79485F9EC /* minifram.cpp */,
+				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
+				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
+				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
+				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
+				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
+				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
+				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
+				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
+				9D1F14339D1C331087650931 /* colour.cpp */,
+				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
+				A5617D10CB7136EC9A4194EF /* display.cpp */,
+				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
+				160EB9744CB63A0B81DC651F /* hid.cpp */,
+				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
+				69F098E47EBF34368ABAE7ED /* timer.cpp */,
+				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
+				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
+				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
+				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
+				CF4F4F5211933057824B5621 /* button_osx.cpp */,
+				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
+				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
+				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
+				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
+				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
+				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
+				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
+				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
+				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
+				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
+				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
+				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
+				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
+				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
+				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
+				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
+				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
+				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
+				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
+				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
+				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
+				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
+				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
+				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
+				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
+				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
+				8C78A1539462370CAA429508 /* accel.cpp */,
+				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
+				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
+				18044326B5B13A98A49732DD /* fontdlg.cpp */,
+				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
+				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
+				757B31FCCA1F381C95B30DF8 /* app.cpp */,
+				7A3F26F539473705AA82411D /* combobox.cpp */,
+				12363D1F50FE301DAEE7F04A /* control.cpp */,
+				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
+				B17772732159304AA7312D72 /* dcclient.cpp */,
+				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
+				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
+				1C4762898E5330C28651EE73 /* graphics.cpp */,
+				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
+				C3019BA65DD73F30A865365F /* frame.cpp */,
+				B568A7364ECA30288820CCE7 /* mdi.cpp */,
+				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
+				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
+				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
+				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
+				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
+				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
+				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
+				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
 				6A82EDCFFBAC30098B238957 /* caret.cpp */,
 				2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */,
 				84758329F2163F00A9C005DF /* collpaneg.cpp */,
@@ -3187,7 +2882,168 @@
 				64DA16CF41C834D7B7642024 /* prntdlgg.cpp */,
 				071FEABEA61E3B559A47A7DB /* statusbr.cpp */,
 				E9B31409EC6532FC83B0B957 /* textmeasure.cpp */,
+				9979CCEEC4C73A6489EF1A21 /* anybutton.cpp */,
+				AA69FCE7B4FA377E98438FE5 /* bmpbuttn.cpp */,
+				926AEAA989793A2F82185627 /* button.cpp */,
+				19A5AFB993843FF0B8F75E47 /* checkbox.cpp */,
+				BCC5B7709F4C3875A3A316C3 /* choice.cpp */,
+				91C415400F0435528B9995B7 /* colordlg.cpp */,
+				5DF561FCD0C038B79C62B083 /* dialog.cpp */,
+				59255501B8053FEE8F258873 /* dirdlg.cpp */,
+				E27194D6828C3BB297B2CBAA /* dnd.cpp */,
+				D92E3EEACA2132609CA3D28F /* evtloop.cpp */,
+				7D47A353B2C63204ABDD42DE /* filedlg.cpp */,
+				1BFAF243431D3CA2AA51ADF2 /* gauge.cpp */,
+				ABA5F3C56C8C37809F696A49 /* listbox.cpp */,
+				02A756A2887839B2900F8CAC /* listctrl_mac.cpp */,
+				EC8157AB87CE3E47A98A6190 /* menu.cpp */,
+				44806DDCE6FB305EAED41E92 /* menuitem.cpp */,
+				ABCA89FC1E76356797A2AF2B /* msgdlg.cpp */,
+				95B1DB08E37B3EB193FEFE0C /* nonownedwnd.cpp */,
+				E1A75C83424B32E99AC91B2C /* notebmac.cpp */,
+				E5477A7352353CDE8D96D582 /* printdlg.cpp */,
+				59F8B419381C34A184190EA1 /* radiobut.cpp */,
+				B9D43F0F1CCA3BED871F7A6C /* scrolbar.cpp */,
+				75278C04709D3482A2660DFC /* slider.cpp */,
+				A05AEAB07C613BE2A0357BD8 /* spinbutt.cpp */,
+				F8A72557C5B13F16A59980EF /* srchctrl.cpp */,
+				1B7E02F461A33397B00E9004 /* statbmp.cpp */,
+				32B2BC8A91983DDA9CC46793 /* statbox.cpp */,
+				4148D62D50863214B8479E60 /* statlmac.cpp */,
+				3A28411B852734BDA2C04165 /* stattext.cpp */,
+				F97C7436BF3B3BBEB423550D /* textctrl.cpp */,
+				71F35835D4DE34D59F924E36 /* tglbtn.cpp */,
+				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
+				5D90D0FA35833140A3CCCD94 /* tooltip.cpp */,
+				D35F1F29F9D33C2B9730D4EE /* window.cpp */,
+				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
+				8555204EBA8930809B732842 /* accesscmn.cpp */,
+				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
+				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
+				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
+				29387393C07C39DB8FF1663B /* artprov.cpp */,
+				24E82A05E9A9323287CDB15B /* artstd.cpp */,
+				9988CBB0772A3539970162FA /* arttango.cpp */,
+				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
+				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
+				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
+				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
+				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
+				4FC2F076657431458896115A /* checkboxcmn.cpp */,
+				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
+				24930711031D35288D28B04B /* choiccmn.cpp */,
+				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
+				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
+				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
+				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
+				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
+				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
+				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
+				B3645350F572364BABF50238 /* containr.cpp */,
+				67DCEEB6861731319C30817F /* cshelp.cpp */,
+				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
+				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
+				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
+				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
+				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
+				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
+				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
+				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
+				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
+				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
+				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
+				AB634FD597793A74B3B3AA7F /* docview.cpp */,
+				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
+				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
+				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
+				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
+				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
+				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
+				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
+				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
+				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
+				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
+				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
 				BACAA6CE4A0934459F26B27C /* graphicc.cpp */,
+				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
+				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
+				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
+				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
+				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
+				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
+				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
+				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
+				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
+				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
+				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
+				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
+				BBB30516233A39BE809405AA /* helpbase.cpp */,
+				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
+				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
+				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
+				81A30C745CA73E30B788B408 /* image.cpp */,
+				137E01C362E134449BF966ED /* imagfill.cpp */,
+				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
+				A4A745D1821A32D591D76650 /* imagiff.cpp */,
+				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
+				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
+				24396D584D053948A3FF0DCD /* imagpng.cpp */,
+				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
+				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
+				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
+				5C85865D28DC31649440A921 /* imagxpm.cpp */,
+				BEB08798C70E33DDB360E563 /* layout.cpp */,
+				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
+				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
+				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
+				EF330EAACFA53877BE289896 /* matrix.cpp */,
+				F175D6E8E5723FC797701275 /* menucmn.cpp */,
+				58E7C516E2453A269280A404 /* modalhook.cpp */,
+				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
+				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
+				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
+				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
+				87D973CA8D673267BD0844D3 /* paper.cpp */,
+				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
+				22D9626646773CED82449D5D /* persist.cpp */,
+				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
+				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
+				A046179831F63824A67B509B /* preferencescmn.cpp */,
+				242BF97B558634A79322052C /* prntbase.cpp */,
+				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
+				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
+				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
+				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
+				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
+				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
+				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
+				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
+				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
+				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
+				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
+				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
+				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
+				9C87B071E3593A889704F512 /* statbar.cpp */,
+				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
+				D73954EB5397301F87881646 /* statboxcmn.cpp */,
+				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
+				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
+				B180290089B139F18B0C7BBA /* stockitem.cpp */,
+				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
+				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
+				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
+				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
+				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
+				7BA6ADD758693BD180D3275B /* treebase.cpp */,
+				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
+				F7440859617F3B47AF4D3817 /* valgen.cpp */,
+				01BA6D45FE4C381493EB4372 /* validate.cpp */,
+				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
+				684D92E552BE313CBE0A88AA /* valnum.cpp */,
+				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
+				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
+				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
+				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
 				2F94CF171F4532B89FECF475 /* busyinfo.cpp */,
 				5612DBC4125B379DA2B28824 /* buttonbar.cpp */,
 				CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */,
@@ -3223,13 +3079,22 @@
 				7925E38823563BCDB5565DCF /* treebkg.cpp */,
 				AA90128E29A03CCCA30F4D35 /* vlbox.cpp */,
 				1629FA905F903324AA5BE72C /* vscroll.cpp */,
+				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
 			);
-			name = src/generic;
+			name = core;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA692 /* src/generic */ = {
+		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
 			isa = PBXGroup;
 			children = (
+				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
+				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
+				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
+				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
+				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
+				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
+				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
+				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
 				77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
 				36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
 				13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
@@ -3255,130 +3120,60 @@
 				B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
+				4692909E4B823F71822B13F8 /* taskbarcmn.cpp */,
 				580AFC66F3003582B43043B1 /* animateg.cpp */,
+				BBF01162E86737818F704DBE /* aboutdlg.cpp */,
+				39B825E5EAB43D9ABDCEB2CD /* drawer.cpp */,
+				5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */,
+				A5E4E466CCBA3A78A38A6E79 /* dataview.cpp */,
+				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
+				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
+				BACF6FE87AD337729BBB72BD /* taskbar.cpp */,
+				018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */,
 			);
-			name = src/generic;
+			name = adv;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA693 /* src/generic */ = {
+		374BD863E6AD33189B7E4040 /* net */ = {
 			isa = PBXGroup;
 			children = (
-				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
+				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
+				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
+				F84F0DB790A23D92A193D2B4 /* http.cpp */,
+				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
+				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
+				56653FACC7D13804A70556AD /* sckfile.cpp */,
+				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
+				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
+				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
+				49612306912038DDBCABB4DE /* url.cpp */,
+				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
+				4969528429903F15882F5391 /* sockosx.cpp */,
 			);
-			name = src/generic;
+			name = net;
 			sourceTree = "<group>";
 		};
-		88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = {
+		42F504C4994C38D7A8F062F4 /* libexpat */ = {
 			isa = PBXGroup;
 			children = (
-				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
-				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
-				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
-				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
-				975E3B6A269434F0A069987D /* Catalogue.cxx */,
-				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
-				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
-				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
-				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
-				71DB140E670738839EC42C2B /* Document.cxx */,
-				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
-				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
-				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
-				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
-				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
-				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
-				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
-				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
-				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
-				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
-				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
-				C28429A964C337A192D76CC8 /* Style.cxx */,
-				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
-				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
-				C25521AF59B9324EB2809C73 /* XPM.cxx */,
+				A92B6033D8233DB1821F193B /* xmlparse.c */,
+				59C6B9849FF6325E890942EF /* xmlrole.c */,
+				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
 			);
-			name = src/stc/scintilla/src;
+			name = libexpat;
 			sourceTree = "<group>";
 		};
-		944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = {
+		4D98B791E17232D39944F04F /* xml */ = {
 			isa = PBXGroup;
 			children = (
-				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				E6AB648BC5173104A96CAE66 /* xml.cpp */,
+				4048A3523EC03409BD899BEF /* xtixml.cpp */,
 			);
-			name = src/html/htmlctrl/webkit;
+			name = xml;
 			sourceTree = "<group>";
 		};
-		98C15055598A3586BDB4FD0F /* src/aui */ = {
-			isa = PBXGroup;
-			children = (
-				26632A254717372BAA4D514D /* framemanager.cpp */,
-				BD709DEB71623974B9836D69 /* dockart.cpp */,
-				A881F49ADCF33C299B041584 /* floatpane.cpp */,
-				A298576700C33F018616E7BD /* auibook.cpp */,
-				05A4437E9697300390FDE14E /* auibar.cpp */,
-				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
-				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
-			);
-			name = src/aui;
-			sourceTree = "<group>";
-		};
-		9A6B5D3E90513D0396CFE0EF /* src/stc */ = {
-			isa = PBXGroup;
-			children = (
-				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
-				47FF6D792CA234C395692118 /* PlatWX.cpp */,
-				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
-			);
-			name = src/stc;
-			sourceTree = "<group>";
-		};
-		A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = {
-			isa = PBXGroup;
-			children = (
-				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
-				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
-				F82278F9AF0432529891E6D7 /* tif_close.c */,
-				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
-				149D299A0EDB3D998118EC93 /* tif_color.c */,
-				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
-				E79B2D1F630036129B9677A7 /* tif_dir.c */,
-				032A38738B58394E8617617B /* tif_dirinfo.c */,
-				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
-				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
-				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
-				48F1439BF6C3361296F05A33 /* tif_error.c */,
-				AF7CE00168AB33C994374ABA /* tif_extension.c */,
-				30FD1048328234E59D319863 /* tif_fax3.c */,
-				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
-				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
-				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
-				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
-				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
-				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
-				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
-				3088384F07C63A5DB3581656 /* tif_lzma.c */,
-				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
-				DFDC805DD3063C389F93642D /* tif_next.c */,
-				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
-				1731A6096BFC3A468AB4755A /* tif_open.c */,
-				9CE73979D0933A43830307E4 /* tif_packbits.c */,
-				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
-				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
-				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
-				64B25B87203E3464BCDD277D /* tif_read.c */,
-				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
-				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
-				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
-				BD88495AF72531A28D2201D0 /* tif_tile.c */,
-				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
-				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
-				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
-				726C0457DF1232C793918DC1 /* tif_zip.c */,
-			);
-			name = src/tiff/libtiff;
-			sourceTree = "<group>";
-		};
-		A7471B15D7093D38B8649962 /* src/zlib */ = {
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
 			isa = PBXGroup;
 			children = (
 				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
@@ -3397,88 +3192,92 @@
 				513033E36E643593AC305B3D /* uncompr.c */,
 				4CB467F9898C3952A68D988B /* zutil.c */,
 			);
-			name = src/zlib;
+			name = libzlib;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908046 /* src/osx/core */ = {
+		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
-				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
-				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
-				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
-				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
-				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
-				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
+				C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */,
+				D03731D60A063988AF6AE70F /* mediactrl.cpp */,
 			);
-			name = src/osx/core;
+			name = media;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908047 /* src/osx/core */ = {
+		60328E6EA3793DA990E18FC1 /* xrc */ = {
 			isa = PBXGroup;
 			children = (
-				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
-				9D1F14339D1C331087650931 /* colour.cpp */,
-				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
-				A5617D10CB7136EC9A4194EF /* display.cpp */,
-				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
-				160EB9744CB63A0B81DC651F /* hid.cpp */,
-				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
-				69F098E47EBF34368ABAE7ED /* timer.cpp */,
-				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
+				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
+				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
+				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
+				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
+				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
+				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
+				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
+				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
+				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
+				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
+				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
+				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
+				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
+				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
+				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
+				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
+				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
+				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
+				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
+				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
+				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
+				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
+				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
+				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
+				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
+				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
+				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
+				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
+				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
+				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
+				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
+				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
+				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
+				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
+				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
+				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
+				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
+				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
+				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
+				F43AF44465B335479752116D /* xh_radbx.cpp */,
+				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 */,
+				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
+				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
+				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
+				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
+				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
+				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
+				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
+				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
+				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
+				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
+				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
+				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
+				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
+				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
+				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
+				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
+				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
+				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
+				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
 			);
-			name = src/osx/core;
+			name = xrc;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908048 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				4969528429903F15882F5391 /* sockosx.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		AC04244D4E183DF480908049 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		B1EF68113C6338CFBBED0FBE /* libregex */ = {
-			isa = PBXGroup;
-			children = (
-				4B7A97D6D29E3627B312E104 /* src/regex */,
-			);
-			name = libregex;
-			sourceTree = "<group>";
-		};
-		B402B38DB4CF3883AF4743C0 /* src/ribbon */ = {
-			isa = PBXGroup;
-			children = (
-				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
-				B540E18F9C91381CA175BABB /* art_msw.cpp */,
-				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
-				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
-				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
-				12363D1F50FE301DAEE7F04B /* control.cpp */,
-				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
-				59ED0C057D8F388A89DC7177 /* page.cpp */,
-				00969CBE3B8F32C78C195619 /* panel.cpp */,
-				BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */,
-			);
-			name = src/ribbon;
-			sourceTree = "<group>";
-		};
-		B8F95052522B37AB86DA8917 /* propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				318BFB22ACCA37E19A1BD431 /* src/propgrid */,
-			);
-			name = propgrid;
-			sourceTree = "<group>";
-		};
-		B8FCB2D33F3B3E30A75D7ABD /* src/html */ = {
+		60E51BFF5CD2327483201F14 /* html */ = {
 			isa = PBXGroup;
 			children = (
 				2E24C6F2A04E30EB95598305 /* chm.cpp */,
@@ -3506,28 +3305,41 @@
 				082CA018FB883999839C1DCE /* m_tables.cpp */,
 				3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */,
 				7FCA75FE592C3469AE351FBF /* winpars.cpp */,
+				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
 			);
-			name = src/html;
+			name = html;
 			sourceTree = "<group>";
 		};
-		B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */ = {
+		62E50658BDAD369D92294F68 /* webview */ = {
 			isa = PBXGroup;
 			children = (
-				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
-				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
-				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
-				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
-				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
-				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
-				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
-				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
-				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
-				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				5FEECFD764E037288CE94FEB /* webview_webkit.mm */,
+				0DA80913C0E33144A42BD30F /* webview.cpp */,
+				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
+				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
 			);
-			name = src/stc/scintilla/lexlib;
+			name = webview;
 			sourceTree = "<group>";
 		};
-		C1D1DDEBCD103A95BE0B52D4 /* src/png */ = {
+		64B126D857113F24BA8C4758 /* richtext */ = {
+			isa = PBXGroup;
+			children = (
+				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
+				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
+				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
+				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
+				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
+				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
+				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
+				D30617843F33310089C1F77A /* richtextstyles.cpp */,
+				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
+				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
+				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
+			);
+			name = richtext;
+			sourceTree = "<group>";
+		};
+		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
 			isa = PBXGroup;
 			children = (
 				AF26BAB1F4733114926F1724 /* png.c */,
@@ -3546,64 +3358,10 @@
 				0964797530CF3FE7B8DB6242 /* pngwtran.c */,
 				45D7558DF5E03A2EB41883F0 /* pngwutil.c */,
 			);
-			name = src/png;
+			name = libpng;
 			sourceTree = "<group>";
 		};
-		C23A03BC68833F7E8BA62CF1 /* src/xml */ = {
-			isa = PBXGroup;
-			children = (
-				E6AB648BC5173104A96CAE66 /* xml.cpp */,
-			);
-			name = src/xml;
-			sourceTree = "<group>";
-		};
-		C2FC1A9BBB8C3046994369BF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				9FBCD305199836939824BF97 /* libwx_osx_carbon.dylib */,
-				DE95737968723BE98DD68918 /* libwx_osx_carbon_static.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1120 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
-				F7332A03D93D3DABB050615D /* dir.cpp */,
-				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
-				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
-				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
-				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
-				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
-				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
-				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
-				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
-				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
-				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
-				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
-				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1121 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1122 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		D85137B3D94F34B6B3686909 /* src/jpeg */ = {
+		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
 			isa = PBXGroup;
 			children = (
 				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
@@ -3653,10 +3411,20 @@
 				02D9332D5C5632E981936E29 /* jquant2.c */,
 				0890779C662C35889A8C6C2E /* jdmerge.c */,
 			);
-			name = src/jpeg;
+			name = libjpeg;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D6 /* src/common */ = {
+		816DD323A67F3B299C8F3481 /* opengl */ = {
+			isa = PBXGroup;
+			children = (
+				E08A51FA8D8A361681B07295 /* glcmn.cpp */,
+				8B6FCA050C26323893012BD6 /* glcanvas.cpp */,
+				FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */,
+			);
+			name = opengl;
+			sourceTree = "<group>";
+		};
+		83F62FA47C9636169F1E18E8 /* base */ = {
 			isa = PBXGroup;
 			children = (
 				4867546E8B8D3C8683A23ED5 /* any.cpp */,
@@ -3745,222 +3513,80 @@
 				54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */,
 				B9B5BC858CCF3477895D2786 /* zstream.cpp */,
 				7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */,
+				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
+				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
+				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
+				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
+				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
+				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
+				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
 				47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */,
 				A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */,
+				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
+				F7332A03D93D3DABB050615D /* dir.cpp */,
+				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
+				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
+				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
+				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
+				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
+				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
+				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
+				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
+				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
+				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
+				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
+				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
 				7A34C5BBBA543DC0A50DE1B6 /* event.cpp */,
 				C9A305CEC03B3085B159B617 /* fs_mem.cpp */,
 				E968913A9A593B258BD8EACB /* msgout.cpp */,
 				4188821BBA833CCAA678B234 /* utilscmn.cpp */,
+				BB924887605E3CB388F56776 /* utils.cpp */,
+				D6DFFB06606F3D2E953CFC96 /* uma.cpp */,
 			);
-			name = src/common;
+			name = base;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D7 /* src/common */ = {
+		B1EF68113C6338CFBBED0FBE /* libregex */ = {
 			isa = PBXGroup;
 			children = (
-				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
-				8555204EBA8930809B732842 /* accesscmn.cpp */,
-				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
-				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
-				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
-				29387393C07C39DB8FF1663B /* artprov.cpp */,
-				24E82A05E9A9323287CDB15B /* artstd.cpp */,
-				9988CBB0772A3539970162FA /* arttango.cpp */,
-				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
-				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
-				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
-				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
-				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
-				4FC2F076657431458896115A /* checkboxcmn.cpp */,
-				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
-				24930711031D35288D28B04B /* choiccmn.cpp */,
-				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
-				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
-				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
-				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
-				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
-				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
-				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
-				B3645350F572364BABF50238 /* containr.cpp */,
-				67DCEEB6861731319C30817F /* cshelp.cpp */,
-				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
-				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
-				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
-				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
-				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
-				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
-				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
-				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
-				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
-				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
-				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
-				AB634FD597793A74B3B3AA7F /* docview.cpp */,
-				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
-				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
-				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
-				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
-				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
-				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
-				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
-				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
-				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
-				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
-				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
-				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
-				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
-				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
-				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
-				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
-				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
-				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
-				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
-				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
-				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
-				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
-				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
-				BBB30516233A39BE809405AA /* helpbase.cpp */,
-				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
-				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
-				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
-				81A30C745CA73E30B788B408 /* image.cpp */,
-				137E01C362E134449BF966ED /* imagfill.cpp */,
-				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
-				A4A745D1821A32D591D76650 /* imagiff.cpp */,
-				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
-				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
-				24396D584D053948A3FF0DCD /* imagpng.cpp */,
-				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
-				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
-				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
-				5C85865D28DC31649440A921 /* imagxpm.cpp */,
-				BEB08798C70E33DDB360E563 /* layout.cpp */,
-				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
-				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
-				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
-				EF330EAACFA53877BE289896 /* matrix.cpp */,
-				F175D6E8E5723FC797701275 /* menucmn.cpp */,
-				58E7C516E2453A269280A404 /* modalhook.cpp */,
-				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
-				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
-				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
-				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
-				87D973CA8D673267BD0844D3 /* paper.cpp */,
-				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
-				22D9626646773CED82449D5D /* persist.cpp */,
-				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
-				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
-				A046179831F63824A67B509B /* preferencescmn.cpp */,
-				242BF97B558634A79322052C /* prntbase.cpp */,
-				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
-				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
-				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
-				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
-				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
-				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
-				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
-				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
-				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
-				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
-				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
-				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
-				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
-				9C87B071E3593A889704F512 /* statbar.cpp */,
-				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
-				D73954EB5397301F87881646 /* statboxcmn.cpp */,
-				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
-				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
-				B180290089B139F18B0C7BBA /* stockitem.cpp */,
-				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
-				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
-				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
-				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
-				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
-				7BA6ADD758693BD180D3275B /* treebase.cpp */,
-				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
-				F7440859617F3B47AF4D3817 /* valgen.cpp */,
-				01BA6D45FE4C381493EB4372 /* validate.cpp */,
-				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
-				684D92E552BE313CBE0A88AA /* valnum.cpp */,
-				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
-				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
-				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
-				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
+				E433B890264339BA8DB97B1D /* regcomp.c */,
+				1482A34AC32133E4BE207223 /* regexec.c */,
+				A70C82ADB45A3FB99C420D03 /* regerror.c */,
+				EEE82083BFA430D5B58F8A04 /* regfree.c */,
 			);
-			name = src/common;
+			name = libregex;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D8 /* src/common */ = {
+		B8F95052522B37AB86DA8917 /* propgrid */ = {
 			isa = PBXGroup;
 			children = (
-				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
-				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
-				F84F0DB790A23D92A193D2B4 /* http.cpp */,
-				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
-				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
-				56653FACC7D13804A70556AD /* sckfile.cpp */,
-				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
-				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
-				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
-				49612306912038DDBCABB4DE /* url.cpp */,
-				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				326723AEB79A305F90D6B41D /* advprops.cpp */,
+				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
+				EBED392D081335FA80523244 /* manager.cpp */,
+				58E1F571B01F34D4AB70CA18 /* property.cpp */,
+				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
+				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
+				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
+				C20E46A504113C899B9DD9B7 /* props.cpp */,
 			);
-			name = src/common;
+			name = propgrid;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D9 /* src/common */ = {
+		C2FC1A9BBB8C3046994369BF /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
-				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
-				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
-				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
-				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
-				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
-				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
-				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
-				4692909E4B823F71822B13F8 /* taskbarcmn.cpp */,
+				9FBCD305199836939824BF97 /* libwx_osx_carbon.dylib */,
+				DE95737968723BE98DD68918 /* libwx_osx_carbon_static.a */,
 			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DA /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				0DA80913C0E33144A42BD30F /* webview.cpp */,
-				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
-				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
-			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DB /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				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 */,
-			);
-			name = src/common;
+			name = Products;
 			sourceTree = "<group>";
 		};
 		E96566B813153B4295AD767B /* stc */ = {
 			isa = PBXGroup;
 			children = (
-				9A6B5D3E90513D0396CFE0EF /* src/stc */,
+				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
+				47FF6D792CA234C395692118 /* PlatWX.cpp */,
+				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
 			);
 			name = stc;
 			sourceTree = "<group>";
@@ -3968,89 +3594,63 @@
 		EB288BE7E74B3328B762A461 /* libtiff */ = {
 			isa = PBXGroup;
 			children = (
-				A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */,
+				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
+				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
+				F82278F9AF0432529891E6D7 /* tif_close.c */,
+				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
+				149D299A0EDB3D998118EC93 /* tif_color.c */,
+				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
+				E79B2D1F630036129B9677A7 /* tif_dir.c */,
+				032A38738B58394E8617617B /* tif_dirinfo.c */,
+				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
+				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
+				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
+				48F1439BF6C3361296F05A33 /* tif_error.c */,
+				AF7CE00168AB33C994374ABA /* tif_extension.c */,
+				30FD1048328234E59D319863 /* tif_fax3.c */,
+				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
+				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
+				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
+				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
+				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
+				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
+				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
+				3088384F07C63A5DB3581656 /* tif_lzma.c */,
+				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
+				DFDC805DD3063C389F93642D /* tif_next.c */,
+				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
+				1731A6096BFC3A468AB4755A /* tif_open.c */,
+				9CE73979D0933A43830307E4 /* tif_packbits.c */,
+				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
+				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
+				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
+				64B25B87203E3464BCDD277D /* tif_read.c */,
+				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
+				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
+				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
+				BD88495AF72531A28D2201D0 /* tif_tile.c */,
+				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
+				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
+				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
+				726C0457DF1232C793918DC1 /* tif_zip.c */,
 			);
 			name = libtiff;
 			sourceTree = "<group>";
 		};
-		F494694AB1FD30DEA2087AFB /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				B0665A40F3FC3F218074C63C /* artmac.cpp */,
-				302A13BC64C238A297F4399F /* brush.cpp */,
-				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
-				5FF661188B563D27A11F5716 /* fontutil.cpp */,
-				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
-				693F731B7D1730A79485F9EC /* minifram.cpp */,
-				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
-				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
-				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
-				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
-				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
-				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
-				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
-				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
-				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
-				CF4F4F5211933057824B5621 /* button_osx.cpp */,
-				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
-				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
-				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
-				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
-				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
-				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
-				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
-				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
-				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
-				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
-				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
-				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
-				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
-				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
-				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
-				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
-				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
-				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
-				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
-				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
-				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
-				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
-				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
-				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
-				8C78A1539462370CAA429508 /* accel.cpp */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
-		F494694AB1FD30DEA2087AFC /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */,
-				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
-			);
-			name = src/osx;
-			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 */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
 		FE1C78F1707A30878CBB2B4B /* ribbon */ = {
 			isa = PBXGroup;
 			children = (
-				B402B38DB4CF3883AF4743C0 /* src/ribbon */,
-				348F9A77CB8B315FBC81D215 /* src/xrc */,
+				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
+				B540E18F9C91381CA175BABB /* art_msw.cpp */,
+				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
+				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
+				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
+				12363D1F50FE301DAEE7F04B /* control.cpp */,
+				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
+				59ED0C057D8F388A89DC7177 /* page.cpp */,
+				00969CBE3B8F32C78C195619 /* panel.cpp */,
+				BE4B0CE56BA23002A5C8AF00 /* toolbar.cpp */,
+				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
 			);
 			name = ribbon;
 			sourceTree = "<group>";
diff --git a/build/osx/wxcocoa.xcodeproj/project.pbxproj b/build/osx/wxcocoa.xcodeproj/project.pbxproj
index 9b5c438dab..8c6427d1d2 100644
--- a/build/osx/wxcocoa.xcodeproj/project.pbxproj
+++ b/build/osx/wxcocoa.xcodeproj/project.pbxproj
@@ -2612,53 +2612,19 @@
 		04311EAB76193D5593D43DBB /* aui */ = {
 			isa = PBXGroup;
 			children = (
-				98C15055598A3586BDB4FD0F /* src/aui */,
-				348F9A77CB8B315FBC81D214 /* src/xrc */,
+				26632A254717372BAA4D514D /* framemanager.cpp */,
+				BD709DEB71623974B9836D69 /* dockart.cpp */,
+				A881F49ADCF33C299B041584 /* floatpane.cpp */,
+				A298576700C33F018616E7BD /* auibook.cpp */,
+				05A4437E9697300390FDE14E /* auibar.cpp */,
+				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
+				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
+				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
+				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
 			);
 			name = aui;
 			sourceTree = "<group>";
 		};
-		1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
-				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
-				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
-				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
-				18044326B5B13A98A49732DD /* fontdlg.cpp */,
-				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
-				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
-				757B31FCCA1F381C95B30DF8 /* app.cpp */,
-				7A3F26F539473705AA82411D /* combobox.cpp */,
-				12363D1F50FE301DAEE7F04A /* control.cpp */,
-				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
-				B17772732159304AA7312D72 /* dcclient.cpp */,
-				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
-				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
-				1C4762898E5330C28651EE73 /* graphics.cpp */,
-				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
-				C3019BA65DD73F30A865365F /* frame.cpp */,
-				B568A7364ECA30288820CCE7 /* mdi.cpp */,
-				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
-				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
-				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
-				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
-				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
-				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
-				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
-				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		1246F69B93FC33FFA06EF789 /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
 		1D56230B75893DBA8A923441 /* wxcocoa */ = {
 			isa = PBXGroup;
 			children = (
@@ -2692,292 +2658,7 @@
 			name = wxcocoa;
 			sourceTree = "<group>";
 		};
-		2ABA71836A2C3590B1615B26 /* src/expat/lib */ = {
-			isa = PBXGroup;
-			children = (
-				A92B6033D8233DB1821F193B /* xmlparse.c */,
-				59C6B9849FF6325E890942EF /* xmlrole.c */,
-				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
-			);
-			name = src/expat/lib;
-			sourceTree = "<group>";
-		};
 		2BE6C101F29D318895158F98 /* libscintilla */ = {
-			isa = PBXGroup;
-			children = (
-				6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */,
-				B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */,
-				88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */,
-			);
-			name = libscintilla;
-			sourceTree = "<group>";
-		};
-		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFB /* src/osx */,
-				AC04244D4E183DF480908047 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1121 /* src/unix */,
-				944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */,
-				1246F69B93FC33FFA06EF788 /* src/osx/carbon */,
-				84E0164052A73DE5996EA691 /* src/generic */,
-				FC6F2C71999C3833AC0AD6E2 /* src/osx/cocoa */,
-				D957B1B354FC327288FDF9D7 /* src/common */,
-				348F9A77CB8B315FBC81D212 /* src/xrc */,
-			);
-			name = core;
-			sourceTree = "<group>";
-		};
-		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D9 /* src/common */,
-				84E0164052A73DE5996EA692 /* src/generic */,
-				F494694AB1FD30DEA2087AFC /* src/osx */,
-				1246F69B93FC33FFA06EF789 /* src/osx/carbon */,
-				AC04244D4E183DF480908049 /* src/osx/core */,
-				FC6F2C71999C3833AC0AD6E3 /* src/osx/cocoa */,
-			);
-			name = adv;
-			sourceTree = "<group>";
-		};
-		318BFB22ACCA37E19A1BD431 /* src/propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				326723AEB79A305F90D6B41D /* advprops.cpp */,
-				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
-				EBED392D081335FA80523244 /* manager.cpp */,
-				58E1F571B01F34D4AB70CA18 /* property.cpp */,
-				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
-				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
-				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
-				C20E46A504113C899B9DD9B7 /* props.cpp */,
-			);
-			name = src/propgrid;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D212 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D213 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
-				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
-				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
-				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
-				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
-				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
-				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
-				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
-				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
-				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
-				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
-				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
-				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
-				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
-				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
-				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
-				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
-				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
-				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
-				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
-				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
-				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
-				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
-				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
-				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
-				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
-				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
-				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
-				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
-				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
-				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
-				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
-				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
-				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
-				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
-				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
-				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
-				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
-				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
-				F43AF44465B335479752116D /* xh_radbx.cpp */,
-				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 */,
-				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
-				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
-				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
-				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
-				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
-				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
-				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
-				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
-				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
-				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
-				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
-				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
-				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
-				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
-				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
-				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
-				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
-				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
-				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D214 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
-				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D215 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D216 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		374BD863E6AD33189B7E4040 /* net */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D8 /* src/common */,
-				CBC07D2BC2363BB4B61D1122 /* src/unix */,
-				AC04244D4E183DF480908048 /* src/osx/core */,
-			);
-			name = net;
-			sourceTree = "<group>";
-		};
-		42F504C4994C38D7A8F062F4 /* libexpat */ = {
-			isa = PBXGroup;
-			children = (
-				2ABA71836A2C3590B1615B26 /* src/expat/lib */,
-			);
-			name = libexpat;
-			sourceTree = "<group>";
-		};
-		4B7A97D6D29E3627B312E104 /* src/regex */ = {
-			isa = PBXGroup;
-			children = (
-				E433B890264339BA8DB97B1D /* regcomp.c */,
-				1482A34AC32133E4BE207223 /* regexec.c */,
-				A70C82ADB45A3FB99C420D03 /* regerror.c */,
-				EEE82083BFA430D5B58F8A04 /* regfree.c */,
-			);
-			name = src/regex;
-			sourceTree = "<group>";
-		};
-		4D98B791E17232D39944F04F /* xml */ = {
-			isa = PBXGroup;
-			children = (
-				C23A03BC68833F7E8BA62CF1 /* src/xml */,
-				D957B1B354FC327288FDF9DC /* src/common */,
-			);
-			name = xml;
-			sourceTree = "<group>";
-		};
-		4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = {
-			isa = PBXGroup;
-			children = (
-				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
-				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
-				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
-				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
-				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
-				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
-				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
-				D30617843F33310089C1F77A /* richtextstyles.cpp */,
-				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
-				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
-			);
-			name = src/richtext;
-			sourceTree = "<group>";
-		};
-		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
-			isa = PBXGroup;
-			children = (
-				A7471B15D7093D38B8649962 /* src/zlib */,
-			);
-			name = libzlib;
-			sourceTree = "<group>";
-		};
-		5C5CD199E7573C73AE6F392D /* media */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DB /* src/common */,
-				FC6F2C71999C3833AC0AD6E4 /* src/osx/cocoa */,
-			);
-			name = media;
-			sourceTree = "<group>";
-		};
-		60328E6EA3793DA990E18FC1 /* xrc */ = {
-			isa = PBXGroup;
-			children = (
-				348F9A77CB8B315FBC81D213 /* src/xrc */,
-			);
-			name = xrc;
-			sourceTree = "<group>";
-		};
-		60E51BFF5CD2327483201F14 /* html */ = {
-			isa = PBXGroup;
-			children = (
-				B8FCB2D33F3B3E30A75D7ABD /* src/html */,
-				84E0164052A73DE5996EA693 /* src/generic */,
-			);
-			name = html;
-			sourceTree = "<group>";
-		};
-		62E50658BDAD369D92294F68 /* webview */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFD /* src/osx */,
-				D957B1B354FC327288FDF9DA /* src/common */,
-			);
-			name = webview;
-			sourceTree = "<group>";
-		};
-		64B126D857113F24BA8C4758 /* richtext */ = {
-			isa = PBXGroup;
-			children = (
-				4E6B7B286B7938A3BD44A8E1 /* src/richtext */,
-				348F9A77CB8B315FBC81D216 /* src/xrc */,
-			);
-			name = richtext;
-			sourceTree = "<group>";
-		};
-		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
-			isa = PBXGroup;
-			children = (
-				C1D1DDEBCD103A95BE0B52D4 /* src/png */,
-			);
-			name = libpng;
-			sourceTree = "<group>";
-		};
-		6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */ = {
 			isa = PBXGroup;
 			children = (
 				7020ADB5D3E0375E875B418B /* LexA68k.cxx */,
@@ -3073,51 +2754,126 @@
 				1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */,
 				43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */,
 				9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */,
+				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
+				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
+				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
+				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
+				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
+				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
+				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
+				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
+				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
+				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
+				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
+				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
+				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
+				975E3B6A269434F0A069987D /* Catalogue.cxx */,
+				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
+				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
+				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
+				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
+				71DB140E670738839EC42C2B /* Document.cxx */,
+				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
+				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
+				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
+				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
+				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
+				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
+				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
+				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
+				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
+				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
+				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
+				C28429A964C337A192D76CC8 /* Style.cxx */,
+				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
+				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
+				C25521AF59B9324EB2809C73 /* XPM.cxx */,
 			);
-			name = src/stc/scintilla/lexers;
+			name = libscintilla;
 			sourceTree = "<group>";
 		};
-		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
-			isa = PBXGroup;
-			children = (
-				D85137B3D94F34B6B3686909 /* src/jpeg */,
-			);
-			name = libjpeg;
-			sourceTree = "<group>";
-		};
-		816DD323A67F3B299C8F3481 /* opengl */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DD /* src/common */,
-				FC6F2C71999C3833AC0AD6E5 /* src/osx/cocoa */,
-				F494694AB1FD30DEA2087AFE /* src/osx */,
-			);
-			name = opengl;
-			sourceTree = "<group>";
-		};
-		83F62FA47C9636169F1E18E8 /* base */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D6 /* src/common */,
-				84E0164052A73DE5996EA690 /* src/generic */,
-				AC04244D4E183DF480908046 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1120 /* src/unix */,
-				FC6F2C71999C3833AC0AD6E1 /* src/osx/cocoa */,
-			);
-			name = base;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA690 /* src/generic */ = {
-			isa = PBXGroup;
-			children = (
-				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
-			);
-			name = src/generic;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA691 /* src/generic */ = {
+		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
 			isa = PBXGroup;
 			children = (
+				B0665A40F3FC3F218074C63C /* artmac.cpp */,
+				302A13BC64C238A297F4399F /* brush.cpp */,
+				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
+				5FF661188B563D27A11F5716 /* fontutil.cpp */,
+				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
+				693F731B7D1730A79485F9EC /* minifram.cpp */,
+				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
+				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
+				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
+				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
+				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
+				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
+				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
+				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
+				9D1F14339D1C331087650931 /* colour.cpp */,
+				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
+				A5617D10CB7136EC9A4194EF /* display.cpp */,
+				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
+				160EB9744CB63A0B81DC651F /* hid.cpp */,
+				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
+				69F098E47EBF34368ABAE7ED /* timer.cpp */,
+				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
+				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
+				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
+				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
+				CF4F4F5211933057824B5621 /* button_osx.cpp */,
+				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
+				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
+				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
+				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
+				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
+				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
+				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
+				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
+				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
+				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
+				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
+				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
+				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
+				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
+				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
+				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
+				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
+				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
+				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
+				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
+				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
+				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
+				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
+				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
+				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
+				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
+				8C78A1539462370CAA429508 /* accel.cpp */,
+				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
+				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
+				18044326B5B13A98A49732DD /* fontdlg.cpp */,
+				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
+				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
+				757B31FCCA1F381C95B30DF8 /* app.cpp */,
+				7A3F26F539473705AA82411D /* combobox.cpp */,
+				12363D1F50FE301DAEE7F04A /* control.cpp */,
+				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
+				B17772732159304AA7312D72 /* dcclient.cpp */,
+				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
+				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
+				1C4762898E5330C28651EE73 /* graphics.cpp */,
+				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
+				C3019BA65DD73F30A865365F /* frame.cpp */,
+				B568A7364ECA30288820CCE7 /* mdi.cpp */,
+				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
+				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
+				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
+				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
+				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
+				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
+				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
+				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
 				6A82EDCFFBAC30098B238957 /* caret.cpp */,
 				2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */,
 				84758329F2163F00A9C005DF /* collpaneg.cpp */,
@@ -3132,7 +2888,167 @@
 				64DA16CF41C834D7B7642024 /* prntdlgg.cpp */,
 				071FEABEA61E3B559A47A7DB /* statusbr.cpp */,
 				E9B31409EC6532FC83B0B957 /* textmeasure.cpp */,
+				F4020D790AE7363CB29F1C2F /* anybutton.mm */,
+				C06FED83BF933DF98C2466AE /* button.mm */,
+				81708CFA21A03013ACB8DDD7 /* checkbox.mm */,
+				9F838F853CB03CF7932C08C3 /* choice.mm */,
+				7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */,
+				57C06D5DB5F733A4A235B206 /* combobox.mm */,
+				83B878A16ABC396E8C03A15E /* dialog.mm */,
+				0B0DC125AFFC322E8E496262 /* dirdlg.mm */,
+				6E53493CB84A30AE8C1CD721 /* dnd.mm */,
+				8D2549709E0133C9A267E3A5 /* evtloop.mm */,
+				DC8A52CA69053B27B09F1037 /* filedlg.mm */,
+				98A7F0605AAC3D28A8C9F253 /* gauge.mm */,
+				D324650313003AAD96E12962 /* listbox.mm */,
+				1D799486AD7F336BB1F33DDC /* menu.mm */,
+				61548D0FE1353D7C846DD721 /* menuitem.mm */,
+				33CFE51FD6F0362092DF1A85 /* msgdlg.mm */,
+				AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */,
+				0E8036758CEC3296B555E4DF /* notebook.mm */,
+				99E5B6DD00273D978C241BCA /* radiobut.mm */,
+				835C22B71A0F3C469310E1E0 /* preferences.mm */,
+				C9E32802E8ED3E729FF34CFC /* printdlg.mm */,
+				CC2E24773D853A77B9FEFA4C /* scrolbar.mm */,
+				9B862D1027C4367BBF44420F /* slider.mm */,
+				3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */,
+				14EF4B028AD63B4A885D29A1 /* srchctrl.mm */,
+				926BDF9C386C3A9A8C24D453 /* statbox.mm */,
+				743EF8DB16CE371DA5C66623 /* statline.mm */,
+				95186FEF3DEF39D8B1157BD5 /* stattext.mm */,
+				E4E16323A43E36DC8024EDF1 /* textctrl.mm */,
+				5CFC6875EF4732E88E029065 /* tglbtn.mm */,
+				A3BF8C9FF2D5314591329D0D /* toolbar.mm */,
+				31EFBD7D10003A5187348B35 /* tooltip.mm */,
+				C94DC3402FAE3C4FA776DEEA /* window.mm */,
+				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
+				8555204EBA8930809B732842 /* accesscmn.cpp */,
+				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
+				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
+				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
+				29387393C07C39DB8FF1663B /* artprov.cpp */,
+				24E82A05E9A9323287CDB15B /* artstd.cpp */,
+				9988CBB0772A3539970162FA /* arttango.cpp */,
+				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
+				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
+				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
+				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
+				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
+				4FC2F076657431458896115A /* checkboxcmn.cpp */,
+				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
+				24930711031D35288D28B04B /* choiccmn.cpp */,
+				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
+				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
+				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
+				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
+				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
+				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
+				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
+				B3645350F572364BABF50238 /* containr.cpp */,
+				67DCEEB6861731319C30817F /* cshelp.cpp */,
+				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
+				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
+				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
+				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
+				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
+				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
+				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
+				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
+				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
+				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
+				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
+				AB634FD597793A74B3B3AA7F /* docview.cpp */,
+				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
+				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
+				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
+				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
+				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
+				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
+				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
+				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
+				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
+				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
+				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
 				BACAA6CE4A0934459F26B27C /* graphicc.cpp */,
+				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
+				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
+				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
+				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
+				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
+				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
+				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
+				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
+				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
+				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
+				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
+				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
+				BBB30516233A39BE809405AA /* helpbase.cpp */,
+				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
+				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
+				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
+				81A30C745CA73E30B788B408 /* image.cpp */,
+				137E01C362E134449BF966ED /* imagfill.cpp */,
+				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
+				A4A745D1821A32D591D76650 /* imagiff.cpp */,
+				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
+				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
+				24396D584D053948A3FF0DCD /* imagpng.cpp */,
+				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
+				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
+				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
+				5C85865D28DC31649440A921 /* imagxpm.cpp */,
+				BEB08798C70E33DDB360E563 /* layout.cpp */,
+				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
+				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
+				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
+				EF330EAACFA53877BE289896 /* matrix.cpp */,
+				F175D6E8E5723FC797701275 /* menucmn.cpp */,
+				58E7C516E2453A269280A404 /* modalhook.cpp */,
+				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
+				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
+				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
+				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
+				87D973CA8D673267BD0844D3 /* paper.cpp */,
+				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
+				22D9626646773CED82449D5D /* persist.cpp */,
+				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
+				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
+				A046179831F63824A67B509B /* preferencescmn.cpp */,
+				242BF97B558634A79322052C /* prntbase.cpp */,
+				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
+				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
+				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
+				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
+				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
+				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
+				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
+				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
+				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
+				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
+				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
+				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
+				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
+				9C87B071E3593A889704F512 /* statbar.cpp */,
+				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
+				D73954EB5397301F87881646 /* statboxcmn.cpp */,
+				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
+				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
+				B180290089B139F18B0C7BBA /* stockitem.cpp */,
+				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
+				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
+				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
+				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
+				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
+				7BA6ADD758693BD180D3275B /* treebase.cpp */,
+				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
+				F7440859617F3B47AF4D3817 /* valgen.cpp */,
+				01BA6D45FE4C381493EB4372 /* validate.cpp */,
+				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
+				684D92E552BE313CBE0A88AA /* valnum.cpp */,
+				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
+				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
+				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
+				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
 				2F94CF171F4532B89FECF475 /* busyinfo.cpp */,
 				5612DBC4125B379DA2B28824 /* buttonbar.cpp */,
 				CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */,
@@ -3168,13 +3084,22 @@
 				7925E38823563BCDB5565DCF /* treebkg.cpp */,
 				AA90128E29A03CCCA30F4D35 /* vlbox.cpp */,
 				1629FA905F903324AA5BE72C /* vscroll.cpp */,
+				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
 			);
-			name = src/generic;
+			name = core;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA692 /* src/generic */ = {
+		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
 			isa = PBXGroup;
 			children = (
+				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
+				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
+				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
+				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
+				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
+				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
+				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
+				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
 				77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
 				36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
 				13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
@@ -3200,130 +3125,64 @@
 				B56A9BF7AE1E3F11A5848297 /* tipdlg.cpp */,
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
+				4692909E4B823F71822B13F8 /* taskbarcmn.cpp */,
 				580AFC66F3003582B43043B1 /* animateg.cpp */,
+				D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */,
+				95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */,
+				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
+				0FA0840034F1386F94D17639 /* timectrl_osx.cpp */,
+				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
+				2ACC8667173D3AB09F6214F5 /* sound.cpp */,
+				207F0F88390138B6B41183EB /* aboutdlg.mm */,
+				5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */,
+				DB6963739198360DB3DBCC6C /* dataview.mm */,
+				A0A63980677D371C85A60B75 /* datetimectrl.mm */,
+				2A4D36DE66EC3EB09E883D6B /* taskbar.mm */,
+				018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */,
 			);
-			name = src/generic;
+			name = adv;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA693 /* src/generic */ = {
+		374BD863E6AD33189B7E4040 /* net */ = {
 			isa = PBXGroup;
 			children = (
-				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
+				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
+				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
+				F84F0DB790A23D92A193D2B4 /* http.cpp */,
+				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
+				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
+				56653FACC7D13804A70556AD /* sckfile.cpp */,
+				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
+				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
+				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
+				49612306912038DDBCABB4DE /* url.cpp */,
+				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
+				4969528429903F15882F5391 /* sockosx.cpp */,
 			);
-			name = src/generic;
+			name = net;
 			sourceTree = "<group>";
 		};
-		88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = {
+		42F504C4994C38D7A8F062F4 /* libexpat */ = {
 			isa = PBXGroup;
 			children = (
-				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
-				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
-				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
-				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
-				975E3B6A269434F0A069987D /* Catalogue.cxx */,
-				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
-				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
-				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
-				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
-				71DB140E670738839EC42C2B /* Document.cxx */,
-				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
-				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
-				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
-				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
-				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
-				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
-				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
-				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
-				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
-				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
-				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
-				C28429A964C337A192D76CC8 /* Style.cxx */,
-				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
-				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
-				C25521AF59B9324EB2809C73 /* XPM.cxx */,
+				A92B6033D8233DB1821F193B /* xmlparse.c */,
+				59C6B9849FF6325E890942EF /* xmlrole.c */,
+				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
 			);
-			name = src/stc/scintilla/src;
+			name = libexpat;
 			sourceTree = "<group>";
 		};
-		944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = {
+		4D98B791E17232D39944F04F /* xml */ = {
 			isa = PBXGroup;
 			children = (
-				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				E6AB648BC5173104A96CAE66 /* xml.cpp */,
+				4048A3523EC03409BD899BEF /* xtixml.cpp */,
 			);
-			name = src/html/htmlctrl/webkit;
+			name = xml;
 			sourceTree = "<group>";
 		};
-		98C15055598A3586BDB4FD0F /* src/aui */ = {
-			isa = PBXGroup;
-			children = (
-				26632A254717372BAA4D514D /* framemanager.cpp */,
-				BD709DEB71623974B9836D69 /* dockart.cpp */,
-				A881F49ADCF33C299B041584 /* floatpane.cpp */,
-				A298576700C33F018616E7BD /* auibook.cpp */,
-				05A4437E9697300390FDE14E /* auibar.cpp */,
-				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
-				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
-			);
-			name = src/aui;
-			sourceTree = "<group>";
-		};
-		9A6B5D3E90513D0396CFE0EF /* src/stc */ = {
-			isa = PBXGroup;
-			children = (
-				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
-				47FF6D792CA234C395692118 /* PlatWX.cpp */,
-				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
-			);
-			name = src/stc;
-			sourceTree = "<group>";
-		};
-		A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = {
-			isa = PBXGroup;
-			children = (
-				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
-				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
-				F82278F9AF0432529891E6D7 /* tif_close.c */,
-				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
-				149D299A0EDB3D998118EC93 /* tif_color.c */,
-				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
-				E79B2D1F630036129B9677A7 /* tif_dir.c */,
-				032A38738B58394E8617617B /* tif_dirinfo.c */,
-				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
-				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
-				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
-				48F1439BF6C3361296F05A33 /* tif_error.c */,
-				AF7CE00168AB33C994374ABA /* tif_extension.c */,
-				30FD1048328234E59D319863 /* tif_fax3.c */,
-				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
-				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
-				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
-				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
-				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
-				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
-				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
-				3088384F07C63A5DB3581656 /* tif_lzma.c */,
-				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
-				DFDC805DD3063C389F93642D /* tif_next.c */,
-				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
-				1731A6096BFC3A468AB4755A /* tif_open.c */,
-				9CE73979D0933A43830307E4 /* tif_packbits.c */,
-				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
-				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
-				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
-				64B25B87203E3464BCDD277D /* tif_read.c */,
-				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
-				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
-				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
-				BD88495AF72531A28D2201D0 /* tif_tile.c */,
-				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
-				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
-				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
-				726C0457DF1232C793918DC1 /* tif_zip.c */,
-			);
-			name = src/tiff/libtiff;
-			sourceTree = "<group>";
-		};
-		A7471B15D7093D38B8649962 /* src/zlib */ = {
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
 			isa = PBXGroup;
 			children = (
 				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
@@ -3342,89 +3201,92 @@
 				513033E36E643593AC305B3D /* uncompr.c */,
 				4CB467F9898C3952A68D988B /* zutil.c */,
 			);
-			name = src/zlib;
+			name = libzlib;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908046 /* src/osx/core */ = {
+		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
-				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
-				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
-				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
-				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
-				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
-				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
+				C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */,
+				6A6A16F9C3B03A7B9077D013 /* mediactrl.mm */,
 			);
-			name = src/osx/core;
+			name = media;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908047 /* src/osx/core */ = {
+		60328E6EA3793DA990E18FC1 /* xrc */ = {
 			isa = PBXGroup;
 			children = (
-				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
-				9D1F14339D1C331087650931 /* colour.cpp */,
-				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
-				A5617D10CB7136EC9A4194EF /* display.cpp */,
-				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
-				160EB9744CB63A0B81DC651F /* hid.cpp */,
-				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
-				69F098E47EBF34368ABAE7ED /* timer.cpp */,
-				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
+				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
+				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
+				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
+				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
+				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
+				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
+				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
+				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
+				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
+				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
+				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
+				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
+				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
+				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
+				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
+				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
+				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
+				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
+				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
+				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
+				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
+				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
+				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
+				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
+				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
+				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
+				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
+				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
+				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
+				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
+				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
+				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
+				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
+				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
+				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
+				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
+				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
+				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
+				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
+				F43AF44465B335479752116D /* xh_radbx.cpp */,
+				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 */,
+				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
+				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
+				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
+				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
+				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
+				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
+				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
+				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
+				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
+				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
+				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
+				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
+				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
+				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
+				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
+				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
+				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
+				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
+				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
 			);
-			name = src/osx/core;
+			name = xrc;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908048 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				4969528429903F15882F5391 /* sockosx.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		AC04244D4E183DF480908049 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				2ACC8667173D3AB09F6214F5 /* sound.cpp */,
-				018B15DE6F3A3D49B9CDE9DE /* hidjoystick.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		B1EF68113C6338CFBBED0FBE /* libregex */ = {
-			isa = PBXGroup;
-			children = (
-				4B7A97D6D29E3627B312E104 /* src/regex */,
-			);
-			name = libregex;
-			sourceTree = "<group>";
-		};
-		B402B38DB4CF3883AF4743C0 /* src/ribbon */ = {
-			isa = PBXGroup;
-			children = (
-				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
-				B540E18F9C91381CA175BABB /* art_msw.cpp */,
-				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
-				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
-				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
-				12363D1F50FE301DAEE7F04B /* control.cpp */,
-				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
-				59ED0C057D8F388A89DC7177 /* page.cpp */,
-				00969CBE3B8F32C78C195619 /* panel.cpp */,
-				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
-			);
-			name = src/ribbon;
-			sourceTree = "<group>";
-		};
-		B8F95052522B37AB86DA8917 /* propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				318BFB22ACCA37E19A1BD431 /* src/propgrid */,
-			);
-			name = propgrid;
-			sourceTree = "<group>";
-		};
-		B8FCB2D33F3B3E30A75D7ABD /* src/html */ = {
+		60E51BFF5CD2327483201F14 /* html */ = {
 			isa = PBXGroup;
 			children = (
 				2E24C6F2A04E30EB95598305 /* chm.cpp */,
@@ -3452,28 +3314,41 @@
 				082CA018FB883999839C1DCE /* m_tables.cpp */,
 				3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */,
 				7FCA75FE592C3469AE351FBF /* winpars.cpp */,
+				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
 			);
-			name = src/html;
+			name = html;
 			sourceTree = "<group>";
 		};
-		B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */ = {
+		62E50658BDAD369D92294F68 /* webview */ = {
 			isa = PBXGroup;
 			children = (
-				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
-				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
-				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
-				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
-				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
-				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
-				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
-				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
-				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
-				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				5FEECFD764E037288CE94FEB /* webview_webkit.mm */,
+				0DA80913C0E33144A42BD30F /* webview.cpp */,
+				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
+				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
 			);
-			name = src/stc/scintilla/lexlib;
+			name = webview;
 			sourceTree = "<group>";
 		};
-		C1D1DDEBCD103A95BE0B52D4 /* src/png */ = {
+		64B126D857113F24BA8C4758 /* richtext */ = {
+			isa = PBXGroup;
+			children = (
+				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
+				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
+				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
+				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
+				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
+				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
+				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
+				D30617843F33310089C1F77A /* richtextstyles.cpp */,
+				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
+				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
+				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
+			);
+			name = richtext;
+			sourceTree = "<group>";
+		};
+		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
 			isa = PBXGroup;
 			children = (
 				AF26BAB1F4733114926F1724 /* png.c */,
@@ -3492,64 +3367,10 @@
 				0964797530CF3FE7B8DB6242 /* pngwtran.c */,
 				45D7558DF5E03A2EB41883F0 /* pngwutil.c */,
 			);
-			name = src/png;
+			name = libpng;
 			sourceTree = "<group>";
 		};
-		C23A03BC68833F7E8BA62CF1 /* src/xml */ = {
-			isa = PBXGroup;
-			children = (
-				E6AB648BC5173104A96CAE66 /* xml.cpp */,
-			);
-			name = src/xml;
-			sourceTree = "<group>";
-		};
-		C2FC1A9BBB8C3046994369BF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */,
-				1D025E39C79E3E119D19686C /* libwx_osx_cocoa_static.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1120 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
-				F7332A03D93D3DABB050615D /* dir.cpp */,
-				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
-				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
-				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
-				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
-				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
-				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
-				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
-				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
-				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
-				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
-				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
-				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1121 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1122 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		D85137B3D94F34B6B3686909 /* src/jpeg */ = {
+		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
 			isa = PBXGroup;
 			children = (
 				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
@@ -3599,10 +3420,20 @@
 				02D9332D5C5632E981936E29 /* jquant2.c */,
 				0890779C662C35889A8C6C2E /* jdmerge.c */,
 			);
-			name = src/jpeg;
+			name = libjpeg;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D6 /* src/common */ = {
+		816DD323A67F3B299C8F3481 /* opengl */ = {
+			isa = PBXGroup;
+			children = (
+				E08A51FA8D8A361681B07295 /* glcmn.cpp */,
+				35007225BB683683AA7C5E48 /* glcanvas.mm */,
+				FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */,
+			);
+			name = opengl;
+			sourceTree = "<group>";
+		};
+		83F62FA47C9636169F1E18E8 /* base */ = {
 			isa = PBXGroup;
 			children = (
 				4867546E8B8D3C8683A23ED5 /* any.cpp */,
@@ -3691,222 +3522,79 @@
 				54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */,
 				B9B5BC858CCF3477895D2786 /* zstream.cpp */,
 				7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */,
+				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
+				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
+				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
+				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
+				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
+				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
+				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
 				47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */,
 				A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */,
+				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
+				F7332A03D93D3DABB050615D /* dir.cpp */,
+				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
+				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
+				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
+				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
+				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
+				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
+				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
+				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
+				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
+				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
+				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
+				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
 				7A34C5BBBA543DC0A50DE1B6 /* event.cpp */,
 				C9A305CEC03B3085B159B617 /* fs_mem.cpp */,
 				E968913A9A593B258BD8EACB /* msgout.cpp */,
 				4188821BBA833CCAA678B234 /* utilscmn.cpp */,
+				789F45D14FF23E248FCFB5FA /* utils.mm */,
 			);
-			name = src/common;
+			name = base;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D7 /* src/common */ = {
+		B1EF68113C6338CFBBED0FBE /* libregex */ = {
 			isa = PBXGroup;
 			children = (
-				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
-				8555204EBA8930809B732842 /* accesscmn.cpp */,
-				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
-				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
-				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
-				29387393C07C39DB8FF1663B /* artprov.cpp */,
-				24E82A05E9A9323287CDB15B /* artstd.cpp */,
-				9988CBB0772A3539970162FA /* arttango.cpp */,
-				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
-				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
-				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
-				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
-				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
-				4FC2F076657431458896115A /* checkboxcmn.cpp */,
-				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
-				24930711031D35288D28B04B /* choiccmn.cpp */,
-				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
-				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
-				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
-				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
-				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
-				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
-				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
-				B3645350F572364BABF50238 /* containr.cpp */,
-				67DCEEB6861731319C30817F /* cshelp.cpp */,
-				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
-				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
-				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
-				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
-				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
-				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
-				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
-				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
-				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
-				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
-				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
-				AB634FD597793A74B3B3AA7F /* docview.cpp */,
-				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
-				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
-				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
-				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
-				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
-				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
-				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
-				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
-				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
-				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
-				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
-				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
-				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
-				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
-				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
-				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
-				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
-				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
-				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
-				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
-				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
-				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
-				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
-				BBB30516233A39BE809405AA /* helpbase.cpp */,
-				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
-				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
-				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
-				81A30C745CA73E30B788B408 /* image.cpp */,
-				137E01C362E134449BF966ED /* imagfill.cpp */,
-				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
-				A4A745D1821A32D591D76650 /* imagiff.cpp */,
-				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
-				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
-				24396D584D053948A3FF0DCD /* imagpng.cpp */,
-				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
-				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
-				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
-				5C85865D28DC31649440A921 /* imagxpm.cpp */,
-				BEB08798C70E33DDB360E563 /* layout.cpp */,
-				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
-				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
-				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
-				EF330EAACFA53877BE289896 /* matrix.cpp */,
-				F175D6E8E5723FC797701275 /* menucmn.cpp */,
-				58E7C516E2453A269280A404 /* modalhook.cpp */,
-				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
-				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
-				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
-				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
-				87D973CA8D673267BD0844D3 /* paper.cpp */,
-				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
-				22D9626646773CED82449D5D /* persist.cpp */,
-				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
-				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
-				A046179831F63824A67B509B /* preferencescmn.cpp */,
-				242BF97B558634A79322052C /* prntbase.cpp */,
-				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
-				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
-				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
-				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
-				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
-				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
-				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
-				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
-				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
-				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
-				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
-				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
-				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
-				9C87B071E3593A889704F512 /* statbar.cpp */,
-				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
-				D73954EB5397301F87881646 /* statboxcmn.cpp */,
-				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
-				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
-				B180290089B139F18B0C7BBA /* stockitem.cpp */,
-				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
-				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
-				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
-				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
-				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
-				7BA6ADD758693BD180D3275B /* treebase.cpp */,
-				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
-				F7440859617F3B47AF4D3817 /* valgen.cpp */,
-				01BA6D45FE4C381493EB4372 /* validate.cpp */,
-				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
-				684D92E552BE313CBE0A88AA /* valnum.cpp */,
-				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
-				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
-				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
-				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
+				E433B890264339BA8DB97B1D /* regcomp.c */,
+				1482A34AC32133E4BE207223 /* regexec.c */,
+				A70C82ADB45A3FB99C420D03 /* regerror.c */,
+				EEE82083BFA430D5B58F8A04 /* regfree.c */,
 			);
-			name = src/common;
+			name = libregex;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D8 /* src/common */ = {
+		B8F95052522B37AB86DA8917 /* propgrid */ = {
 			isa = PBXGroup;
 			children = (
-				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
-				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
-				F84F0DB790A23D92A193D2B4 /* http.cpp */,
-				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
-				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
-				56653FACC7D13804A70556AD /* sckfile.cpp */,
-				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
-				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
-				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
-				49612306912038DDBCABB4DE /* url.cpp */,
-				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				326723AEB79A305F90D6B41D /* advprops.cpp */,
+				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
+				EBED392D081335FA80523244 /* manager.cpp */,
+				58E1F571B01F34D4AB70CA18 /* property.cpp */,
+				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
+				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
+				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
+				C20E46A504113C899B9DD9B7 /* props.cpp */,
 			);
-			name = src/common;
+			name = propgrid;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D9 /* src/common */ = {
+		C2FC1A9BBB8C3046994369BF /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
-				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
-				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
-				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
-				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
-				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
-				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
-				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
-				4692909E4B823F71822B13F8 /* taskbarcmn.cpp */,
+				65C47DFD6E243724A83603F3 /* libwx_osx_cocoa.dylib */,
+				1D025E39C79E3E119D19686C /* libwx_osx_cocoa_static.a */,
 			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DA /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				0DA80913C0E33144A42BD30F /* webview.cpp */,
-				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
-				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
-			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DB /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				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 */,
-			);
-			name = src/common;
+			name = Products;
 			sourceTree = "<group>";
 		};
 		E96566B813153B4295AD767B /* stc */ = {
 			isa = PBXGroup;
 			children = (
-				9A6B5D3E90513D0396CFE0EF /* src/stc */,
+				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
+				47FF6D792CA234C395692118 /* PlatWX.cpp */,
+				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
 			);
 			name = stc;
 			sourceTree = "<group>";
@@ -3914,167 +3602,63 @@
 		EB288BE7E74B3328B762A461 /* libtiff */ = {
 			isa = PBXGroup;
 			children = (
-				A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */,
+				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
+				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
+				F82278F9AF0432529891E6D7 /* tif_close.c */,
+				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
+				149D299A0EDB3D998118EC93 /* tif_color.c */,
+				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
+				E79B2D1F630036129B9677A7 /* tif_dir.c */,
+				032A38738B58394E8617617B /* tif_dirinfo.c */,
+				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
+				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
+				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
+				48F1439BF6C3361296F05A33 /* tif_error.c */,
+				AF7CE00168AB33C994374ABA /* tif_extension.c */,
+				30FD1048328234E59D319863 /* tif_fax3.c */,
+				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
+				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
+				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
+				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
+				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
+				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
+				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
+				3088384F07C63A5DB3581656 /* tif_lzma.c */,
+				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
+				DFDC805DD3063C389F93642D /* tif_next.c */,
+				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
+				1731A6096BFC3A468AB4755A /* tif_open.c */,
+				9CE73979D0933A43830307E4 /* tif_packbits.c */,
+				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
+				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
+				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
+				64B25B87203E3464BCDD277D /* tif_read.c */,
+				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
+				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
+				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
+				BD88495AF72531A28D2201D0 /* tif_tile.c */,
+				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
+				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
+				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
+				726C0457DF1232C793918DC1 /* tif_zip.c */,
 			);
 			name = libtiff;
 			sourceTree = "<group>";
 		};
-		F494694AB1FD30DEA2087AFB /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				B0665A40F3FC3F218074C63C /* artmac.cpp */,
-				302A13BC64C238A297F4399F /* brush.cpp */,
-				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
-				5FF661188B563D27A11F5716 /* fontutil.cpp */,
-				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
-				693F731B7D1730A79485F9EC /* minifram.cpp */,
-				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
-				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
-				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
-				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
-				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
-				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
-				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
-				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
-				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
-				CF4F4F5211933057824B5621 /* button_osx.cpp */,
-				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
-				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
-				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
-				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
-				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
-				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
-				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
-				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
-				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
-				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
-				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
-				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
-				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
-				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
-				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
-				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
-				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
-				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
-				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
-				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
-				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
-				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
-				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
-				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
-				8C78A1539462370CAA429508 /* accel.cpp */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
-		F494694AB1FD30DEA2087AFC /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				D049F49C75043592B7E318B3 /* datetimectrl_osx.cpp */,
-				95B4B2890C3A372DAB8DC7BA /* datectrl_osx.cpp */,
-				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
-				0FA0840034F1386F94D17639 /* timectrl_osx.cpp */,
-				5E53DC332DA23DF4B9BFCDE3 /* dataview_osx.cpp */,
-			);
-			name = src/osx;
-			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 */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
-		FC6F2C71999C3833AC0AD6E1 /* src/osx/cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				789F45D14FF23E248FCFB5FA /* utils.mm */,
-			);
-			name = src/osx/cocoa;
-			sourceTree = "<group>";
-		};
-		FC6F2C71999C3833AC0AD6E2 /* src/osx/cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				F4020D790AE7363CB29F1C2F /* anybutton.mm */,
-				C06FED83BF933DF98C2466AE /* button.mm */,
-				81708CFA21A03013ACB8DDD7 /* checkbox.mm */,
-				9F838F853CB03CF7932C08C3 /* choice.mm */,
-				7CC8B73BB8C0391E9EC1B2D1 /* colour.mm */,
-				57C06D5DB5F733A4A235B206 /* combobox.mm */,
-				83B878A16ABC396E8C03A15E /* dialog.mm */,
-				0B0DC125AFFC322E8E496262 /* dirdlg.mm */,
-				6E53493CB84A30AE8C1CD721 /* dnd.mm */,
-				8D2549709E0133C9A267E3A5 /* evtloop.mm */,
-				DC8A52CA69053B27B09F1037 /* filedlg.mm */,
-				98A7F0605AAC3D28A8C9F253 /* gauge.mm */,
-				D324650313003AAD96E12962 /* listbox.mm */,
-				1D799486AD7F336BB1F33DDC /* menu.mm */,
-				61548D0FE1353D7C846DD721 /* menuitem.mm */,
-				33CFE51FD6F0362092DF1A85 /* msgdlg.mm */,
-				AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */,
-				0E8036758CEC3296B555E4DF /* notebook.mm */,
-				99E5B6DD00273D978C241BCA /* radiobut.mm */,
-				835C22B71A0F3C469310E1E0 /* preferences.mm */,
-				C9E32802E8ED3E729FF34CFC /* printdlg.mm */,
-				CC2E24773D853A77B9FEFA4C /* scrolbar.mm */,
-				9B862D1027C4367BBF44420F /* slider.mm */,
-				3C4A7A93CAFC3E22A2A5F7F3 /* spinbutt.mm */,
-				14EF4B028AD63B4A885D29A1 /* srchctrl.mm */,
-				926BDF9C386C3A9A8C24D453 /* statbox.mm */,
-				743EF8DB16CE371DA5C66623 /* statline.mm */,
-				95186FEF3DEF39D8B1157BD5 /* stattext.mm */,
-				E4E16323A43E36DC8024EDF1 /* textctrl.mm */,
-				5CFC6875EF4732E88E029065 /* tglbtn.mm */,
-				A3BF8C9FF2D5314591329D0D /* toolbar.mm */,
-				31EFBD7D10003A5187348B35 /* tooltip.mm */,
-				C94DC3402FAE3C4FA776DEEA /* window.mm */,
-			);
-			name = src/osx/cocoa;
-			sourceTree = "<group>";
-		};
-		FC6F2C71999C3833AC0AD6E3 /* src/osx/cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				207F0F88390138B6B41183EB /* aboutdlg.mm */,
-				DB6963739198360DB3DBCC6C /* dataview.mm */,
-				A0A63980677D371C85A60B75 /* datetimectrl.mm */,
-				2A4D36DE66EC3EB09E883D6B /* taskbar.mm */,
-			);
-			name = src/osx/cocoa;
-			sourceTree = "<group>";
-		};
-		FC6F2C71999C3833AC0AD6E4 /* src/osx/cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				6A6A16F9C3B03A7B9077D013 /* mediactrl.mm */,
-			);
-			name = src/osx/cocoa;
-			sourceTree = "<group>";
-		};
-		FC6F2C71999C3833AC0AD6E5 /* src/osx/cocoa */ = {
-			isa = PBXGroup;
-			children = (
-				35007225BB683683AA7C5E48 /* glcanvas.mm */,
-			);
-			name = src/osx/cocoa;
-			sourceTree = "<group>";
-		};
 		FE1C78F1707A30878CBB2B4B /* ribbon */ = {
 			isa = PBXGroup;
 			children = (
-				B402B38DB4CF3883AF4743C0 /* src/ribbon */,
-				348F9A77CB8B315FBC81D215 /* src/xrc */,
+				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
+				B540E18F9C91381CA175BABB /* art_msw.cpp */,
+				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
+				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
+				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
+				12363D1F50FE301DAEE7F04B /* control.cpp */,
+				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
+				59ED0C057D8F388A89DC7177 /* page.cpp */,
+				00969CBE3B8F32C78C195619 /* panel.cpp */,
+				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
+				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
 			);
 			name = ribbon;
 			sourceTree = "<group>";
diff --git a/build/osx/wxiphone.xcodeproj/project.pbxproj b/build/osx/wxiphone.xcodeproj/project.pbxproj
index d38319bfda..4c923747b4 100644
--- a/build/osx/wxiphone.xcodeproj/project.pbxproj
+++ b/build/osx/wxiphone.xcodeproj/project.pbxproj
@@ -477,7 +477,6 @@
 		91BDA5B04CF33C9AB7358B8A /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69F098E47EBF34368ABAE7ED /* timer.cpp */; };
 		91EA325FCE3A3A6A8D1D21A5 /* srchctrl_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */; };
 		923F4797A73A3BDD87BBD1E1 /* LineMarker.cxx in Sources */ = {isa = PBXBuildFile; fileRef = AF3DF03795153E039B8F1F87 /* LineMarker.cxx */; };
-		939E53CA56F33194B4681117 /* glgrab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */; };
 		93E04642049537EB8A37BA26 /* htmlwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3FEBA7AC7F743EE88352AEBC /* htmlwin.cpp */; };
 		9455B49669853E71BD4FD965 /* richtextformatdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */; };
 		94B1C88076793400810FAC30 /* png.c in Sources */ = {isa = PBXBuildFile; fileRef = AF26BAB1F4733114926F1724 /* png.c */; };
@@ -533,6 +532,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 */; };
@@ -585,6 +585,7 @@
 		B5C7FD8C27F43F3289A77FC9 /* utilsunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */; };
 		B640A8A74D973A8FBEF63916 /* LexConf.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 04082EC1C91334379425802D /* LexConf.cxx */; };
 		B6891F848CA0325EAB6D1373 /* textentry_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 777385D10CCC350C90F02824 /* textentry_osx.cpp */; };
+		B6BC23F4F3E43315BD4C7CF8 /* mediactrl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6A6A16F9C3B03A7B9077D013 /* mediactrl.mm */; };
 		B6C364CB4AE33708A862B4B4 /* srchctlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D46A36564C78312CAC538E93 /* srchctlg.cpp */; };
 		B791BD05072B3B909A7093C2 /* dcsvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */; };
 		B839235BED6F3609BDB732B8 /* dndcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0116581B77DF3A5D889B8D17 /* dndcmn.cpp */; };
@@ -1176,6 +1177,7 @@
 		69A7F3F58B1E3812A055C84F /* numdlgg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = numdlgg.cpp; path = ../../src/generic/numdlgg.cpp; sourceTree = "<group>"; };
 		69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = propgridiface.cpp; path = ../../src/propgrid/propgridiface.cpp; sourceTree = "<group>"; };
 		69F098E47EBF34368ABAE7ED /* timer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = timer.cpp; path = ../../src/osx/core/timer.cpp; sourceTree = "<group>"; };
+		6A6A16F9C3B03A7B9077D013 /* mediactrl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = mediactrl.mm; path = ../../src/osx/cocoa/mediactrl.mm; sourceTree = "<group>"; };
 		6A82EDCFFBAC30098B238957 /* caret.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = caret.cpp; path = ../../src/generic/caret.cpp; sourceTree = "<group>"; };
 		6AC666417602346EA583709E /* translation.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = translation.cpp; path = ../../src/common/translation.cpp; sourceTree = "<group>"; };
 		6BC0A61629E635FAB4E09505 /* geometry.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geometry.cpp; path = ../../src/common/geometry.cpp; sourceTree = "<group>"; };
@@ -1224,7 +1226,6 @@
 		7A34C5BBBA543DC0A50DE1B6 /* event.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = event.cpp; path = ../../src/common/event.cpp; sourceTree = "<group>"; };
 		7A3F26F539473705AA82411D /* combobox.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = combobox.cpp; path = ../../src/osx/carbon/combobox.cpp; sourceTree = "<group>"; };
 		7AF8F8A78A5130DCB4D46729 /* LexCmake.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexCmake.cxx; path = ../../src/stc/scintilla/lexers/LexCmake.cxx; sourceTree = "<group>"; };
-		7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = glgrab.cpp; path = ../../src/osx/core/glgrab.cpp; sourceTree = "<group>"; };
 		7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = ../../src/osx/core/stdpaths_cf.cpp; sourceTree = "<group>"; };
 		7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = protocol.cpp; path = ../../src/common/protocol.cpp; sourceTree = "<group>"; };
 		7BA6ADD758693BD180D3275B /* treebase.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = treebase.cpp; path = ../../src/common/treebase.cpp; sourceTree = "<group>"; };
@@ -1316,6 +1317,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>"; };
@@ -1725,327 +1727,20 @@
 		04311EAB76193D5593D43DBB /* aui */ = {
 			isa = PBXGroup;
 			children = (
-				98C15055598A3586BDB4FD0F /* src/aui */,
-				348F9A77CB8B315FBC81D214 /* src/xrc */,
+				26632A254717372BAA4D514D /* framemanager.cpp */,
+				BD709DEB71623974B9836D69 /* dockart.cpp */,
+				A881F49ADCF33C299B041584 /* floatpane.cpp */,
+				A298576700C33F018616E7BD /* auibook.cpp */,
+				05A4437E9697300390FDE14E /* auibar.cpp */,
+				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
+				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
+				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
+				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
 			);
 			name = aui;
 			sourceTree = "<group>";
 		};
-		1246F69B93FC33FFA06EF788 /* src/osx/carbon */ = {
-			isa = PBXGroup;
-			children = (
-				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
-				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
-				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
-				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
-				18044326B5B13A98A49732DD /* fontdlg.cpp */,
-				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
-				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
-				757B31FCCA1F381C95B30DF8 /* app.cpp */,
-				7A3F26F539473705AA82411D /* combobox.cpp */,
-				12363D1F50FE301DAEE7F04A /* control.cpp */,
-				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
-				B17772732159304AA7312D72 /* dcclient.cpp */,
-				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
-				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
-				1C4762898E5330C28651EE73 /* graphics.cpp */,
-				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
-				C3019BA65DD73F30A865365F /* frame.cpp */,
-				B568A7364ECA30288820CCE7 /* mdi.cpp */,
-				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
-				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
-				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
-				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
-				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
-				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
-				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
-				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
-			);
-			name = src/osx/carbon;
-			sourceTree = "<group>";
-		};
-		2ABA71836A2C3590B1615B26 /* src/expat/lib */ = {
-			isa = PBXGroup;
-			children = (
-				A92B6033D8233DB1821F193B /* xmlparse.c */,
-				59C6B9849FF6325E890942EF /* xmlrole.c */,
-				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
-			);
-			name = src/expat/lib;
-			sourceTree = "<group>";
-		};
 		2BE6C101F29D318895158F98 /* libscintilla */ = {
-			isa = PBXGroup;
-			children = (
-				6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */,
-				B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */,
-				88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */,
-			);
-			name = libscintilla;
-			sourceTree = "<group>";
-		};
-		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFB /* src/osx */,
-				AC04244D4E183DF480908047 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1121 /* src/unix */,
-				944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */,
-				1246F69B93FC33FFA06EF788 /* src/osx/carbon */,
-				84E0164052A73DE5996EA691 /* src/generic */,
-				D1F5E5C8429235E68E4AC902 /* src/osx/iphone */,
-				D957B1B354FC327288FDF9D7 /* src/common */,
-				348F9A77CB8B315FBC81D212 /* src/xrc */,
-			);
-			name = core;
-			sourceTree = "<group>";
-		};
-		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D9 /* src/common */,
-				84E0164052A73DE5996EA692 /* src/generic */,
-				F494694AB1FD30DEA2087AFC /* src/osx */,
-				AC04244D4E183DF480908049 /* src/osx/core */,
-			);
-			name = adv;
-			sourceTree = "<group>";
-		};
-		318BFB22ACCA37E19A1BD431 /* src/propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				326723AEB79A305F90D6B41D /* advprops.cpp */,
-				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
-				EBED392D081335FA80523244 /* manager.cpp */,
-				58E1F571B01F34D4AB70CA18 /* property.cpp */,
-				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
-				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
-				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
-				C20E46A504113C899B9DD9B7 /* props.cpp */,
-			);
-			name = src/propgrid;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D212 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D213 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
-				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
-				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
-				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
-				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
-				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
-				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
-				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
-				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
-				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
-				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
-				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
-				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
-				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
-				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
-				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
-				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
-				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
-				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
-				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
-				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
-				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
-				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
-				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
-				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
-				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
-				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
-				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
-				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
-				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
-				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
-				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
-				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
-				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
-				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
-				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
-				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
-				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
-				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
-				F43AF44465B335479752116D /* xh_radbx.cpp */,
-				66411D54BAD338498AC59401 /* xh_scrol.cpp */,
-				E97AE22E9F043AB6846B3BE7 /* xh_scwin.cpp */,
-				8E7ADC9F00803853B1004529 /* xh_htmllbox.cpp */,
-				6E855AB3AB08325980871AB4 /* xh_sizer.cpp */,
-				38E0F60AE1F83633A0CC18FC /* xh_slidr.cpp */,
-				950D51915EF83B57B5E8306F /* xh_spin.cpp */,
-				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
-				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
-				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
-				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
-				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
-				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
-				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
-				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
-				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
-				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
-				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
-				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
-				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
-				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
-				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
-				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
-				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
-				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
-				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D214 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				54EBD66FB9C3364681338A27 /* xh_auinotbk.cpp */,
-				0CC4C44F4DB833839AD96DBD /* xh_auitoolb.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D215 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		348F9A77CB8B315FBC81D216 /* src/xrc */ = {
-			isa = PBXGroup;
-			children = (
-				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
-			);
-			name = src/xrc;
-			sourceTree = "<group>";
-		};
-		374BD863E6AD33189B7E4040 /* net */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D8 /* src/common */,
-				CBC07D2BC2363BB4B61D1122 /* src/unix */,
-				AC04244D4E183DF480908048 /* src/osx/core */,
-			);
-			name = net;
-			sourceTree = "<group>";
-		};
-		42F504C4994C38D7A8F062F4 /* libexpat */ = {
-			isa = PBXGroup;
-			children = (
-				2ABA71836A2C3590B1615B26 /* src/expat/lib */,
-			);
-			name = libexpat;
-			sourceTree = "<group>";
-		};
-		4B7A97D6D29E3627B312E104 /* src/regex */ = {
-			isa = PBXGroup;
-			children = (
-				E433B890264339BA8DB97B1D /* regcomp.c */,
-				1482A34AC32133E4BE207223 /* regexec.c */,
-				A70C82ADB45A3FB99C420D03 /* regerror.c */,
-				EEE82083BFA430D5B58F8A04 /* regfree.c */,
-			);
-			name = src/regex;
-			sourceTree = "<group>";
-		};
-		4D98B791E17232D39944F04F /* xml */ = {
-			isa = PBXGroup;
-			children = (
-				C23A03BC68833F7E8BA62CF1 /* src/xml */,
-				D957B1B354FC327288FDF9DC /* src/common */,
-			);
-			name = xml;
-			sourceTree = "<group>";
-		};
-		4E6B7B286B7938A3BD44A8E1 /* src/richtext */ = {
-			isa = PBXGroup;
-			children = (
-				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
-				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
-				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
-				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
-				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
-				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
-				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
-				D30617843F33310089C1F77A /* richtextstyles.cpp */,
-				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
-				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
-			);
-			name = src/richtext;
-			sourceTree = "<group>";
-		};
-		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
-			isa = PBXGroup;
-			children = (
-				A7471B15D7093D38B8649962 /* src/zlib */,
-			);
-			name = libzlib;
-			sourceTree = "<group>";
-		};
-		5C5CD199E7573C73AE6F392D /* media */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DB /* src/common */,
-			);
-			name = media;
-			sourceTree = "<group>";
-		};
-		60328E6EA3793DA990E18FC1 /* xrc */ = {
-			isa = PBXGroup;
-			children = (
-				348F9A77CB8B315FBC81D213 /* src/xrc */,
-			);
-			name = xrc;
-			sourceTree = "<group>";
-		};
-		60E51BFF5CD2327483201F14 /* html */ = {
-			isa = PBXGroup;
-			children = (
-				B8FCB2D33F3B3E30A75D7ABD /* src/html */,
-				84E0164052A73DE5996EA693 /* src/generic */,
-			);
-			name = html;
-			sourceTree = "<group>";
-		};
-		62E50658BDAD369D92294F68 /* webview */ = {
-			isa = PBXGroup;
-			children = (
-				F494694AB1FD30DEA2087AFD /* src/osx */,
-				D957B1B354FC327288FDF9DA /* src/common */,
-			);
-			name = webview;
-			sourceTree = "<group>";
-		};
-		64B126D857113F24BA8C4758 /* richtext */ = {
-			isa = PBXGroup;
-			children = (
-				4E6B7B286B7938A3BD44A8E1 /* src/richtext */,
-				348F9A77CB8B315FBC81D216 /* src/xrc */,
-			);
-			name = richtext;
-			sourceTree = "<group>";
-		};
-		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
-			isa = PBXGroup;
-			children = (
-				C1D1DDEBCD103A95BE0B52D4 /* src/png */,
-			);
-			name = libpng;
-			sourceTree = "<group>";
-		};
-		6EEE2EA1270D310E9E110C94 /* src/stc/scintilla/lexers */ = {
 			isa = PBXGroup;
 			children = (
 				7020ADB5D3E0375E875B418B /* LexA68k.cxx */,
@@ -2141,58 +1836,126 @@
 				1098499A317A3DEEA4D16D0D /* LexVHDL.cxx */,
 				43D416CF0DE334E79A8E48C8 /* LexVisualProlog.cxx */,
 				9CC7C6FFD67233788EEDFC5E /* LexYAML.cxx */,
+				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
+				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
+				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
+				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
+				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
+				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
+				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
+				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
+				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
+				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
+				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
+				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
+				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
+				975E3B6A269434F0A069987D /* Catalogue.cxx */,
+				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
+				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
+				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
+				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
+				71DB140E670738839EC42C2B /* Document.cxx */,
+				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
+				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
+				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
+				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
+				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
+				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
+				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
+				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
+				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
+				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
+				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
+				C28429A964C337A192D76CC8 /* Style.cxx */,
+				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
+				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
+				C25521AF59B9324EB2809C73 /* XPM.cxx */,
 			);
-			name = src/stc/scintilla/lexers;
+			name = libscintilla;
 			sourceTree = "<group>";
 		};
-		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
-			isa = PBXGroup;
-			children = (
-				D85137B3D94F34B6B3686909 /* src/jpeg */,
-			);
-			name = libjpeg;
-			sourceTree = "<group>";
-		};
-		816DD323A67F3B299C8F3481 /* opengl */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9DD /* src/common */,
-				D1F5E5C8429235E68E4AC903 /* src/osx/iphone */,
-				F494694AB1FD30DEA2087AFE /* src/osx */,
-			);
-			name = opengl;
-			sourceTree = "<group>";
-		};
-		82F403E7B8653CBD908BC258 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				F190B80DD28031A98E5BCA67 /* Foundation.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		83F62FA47C9636169F1E18E8 /* base */ = {
-			isa = PBXGroup;
-			children = (
-				D957B1B354FC327288FDF9D6 /* src/common */,
-				84E0164052A73DE5996EA690 /* src/generic */,
-				AC04244D4E183DF480908046 /* src/osx/core */,
-				CBC07D2BC2363BB4B61D1120 /* src/unix */,
-			);
-			name = base;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA690 /* src/generic */ = {
-			isa = PBXGroup;
-			children = (
-				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
-			);
-			name = src/generic;
-			sourceTree = "<group>";
-		};
-		84E0164052A73DE5996EA691 /* src/generic */ = {
+		2E7B4F88F81E37B4A9FF6C0F /* core */ = {
 			isa = PBXGroup;
 			children = (
+				B0665A40F3FC3F218074C63C /* artmac.cpp */,
+				302A13BC64C238A297F4399F /* brush.cpp */,
+				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
+				5FF661188B563D27A11F5716 /* fontutil.cpp */,
+				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
+				693F731B7D1730A79485F9EC /* minifram.cpp */,
+				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
+				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
+				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
+				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
+				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
+				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
+				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
+				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
+				9D1F14339D1C331087650931 /* colour.cpp */,
+				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
+				A5617D10CB7136EC9A4194EF /* display.cpp */,
+				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
+				160EB9744CB63A0B81DC651F /* hid.cpp */,
+				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
+				69F098E47EBF34368ABAE7ED /* timer.cpp */,
+				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
+				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
+				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
+				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
+				CF4F4F5211933057824B5621 /* button_osx.cpp */,
+				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
+				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
+				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
+				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
+				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
+				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
+				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
+				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
+				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
+				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
+				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
+				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
+				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
+				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
+				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
+				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
+				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
+				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
+				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
+				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
+				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
+				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
+				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
+				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
+				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				DAAED71A534135A9A61612A6 /* colordlgosx.mm */,
+				38CEA4A3579331EF808B8363 /* fontdlgosx.mm */,
+				8C78A1539462370CAA429508 /* accel.cpp */,
+				12453E271F2A3AC9969E62A4 /* clipbrd.cpp */,
+				0BF1F491B8A8376E8E2E8182 /* cursor.cpp */,
+				18044326B5B13A98A49732DD /* fontdlg.cpp */,
+				377056CEB1FC3EEB8526E7A6 /* gdiobj.cpp */,
+				F5DAF1F49F0F3F41A427A21D /* icon.cpp */,
+				757B31FCCA1F381C95B30DF8 /* app.cpp */,
+				7A3F26F539473705AA82411D /* combobox.cpp */,
+				12363D1F50FE301DAEE7F04A /* control.cpp */,
+				271B4B77622B3411A7BF6634 /* dataobj.cpp */,
+				B17772732159304AA7312D72 /* dcclient.cpp */,
+				238741BDA2C73E56899CCB04 /* dcprint.cpp */,
+				22D6E6D9712338C6906CFAA4 /* dcscreen.cpp */,
+				1C4762898E5330C28651EE73 /* graphics.cpp */,
+				77F5E7BCD9B2307D8DBCC052 /* font.cpp */,
+				C3019BA65DD73F30A865365F /* frame.cpp */,
+				B568A7364ECA30288820CCE7 /* mdi.cpp */,
+				C2BB2949CC0B387AB6879539 /* metafile.cpp */,
+				2128AD8BD12E3F33AD57478E /* overlay.cpp */,
+				530DC2E26BF2313E8702AD43 /* popupwin.cpp */,
+				425BFA3FDB7D3EA7ADCE1087 /* renderer.cpp */,
+				E6CC2B05353C3284B37B2DD7 /* settings.cpp */,
+				E1F2E9C9052D3E53BBD17DE3 /* statbrma.cpp */,
+				00DA3D3EEF5E305CA73A1871 /* region.cpp */,
+				2AFC4A1CDA473688A590D19F /* utilscocoa.mm */,
 				6A82EDCFFBAC30098B238957 /* caret.cpp */,
 				2B5A9DF3206B3954A4B38BFD /* clrpickerg.cpp */,
 				84758329F2163F00A9C005DF /* collpaneg.cpp */,
@@ -2209,7 +1972,149 @@
 				E9B31409EC6532FC83B0B957 /* textmeasure.cpp */,
 				FE538F33A1423FC2AC9E45F3 /* regiong.cpp */,
 				F5DAF1F49F0F3F41A427A21E /* icon.cpp */,
+				F4020D790AE7363CB29F1C2F /* anybutton.mm */,
+				C06FED83BF933DF98C2466AE /* button.mm */,
+				81708CFA21A03013ACB8DDD7 /* checkbox.mm */,
+				83B878A16ABC396E8C03A15E /* dialog.mm */,
+				8D2549709E0133C9A267E3A5 /* evtloop.mm */,
+				98A7F0605AAC3D28A8C9F253 /* gauge.mm */,
+				33CFE51FD6F0362092DF1A85 /* msgdlg.mm */,
+				AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */,
+				CC2E24773D853A77B9FEFA4C /* scrolbar.mm */,
+				9B862D1027C4367BBF44420F /* slider.mm */,
+				95186FEF3DEF39D8B1157BD5 /* stattext.mm */,
+				E4E16323A43E36DC8024EDF1 /* textctrl.mm */,
+				A3BF8C9FF2D5314591329D0D /* toolbar.mm */,
+				789F45D14FF23E248FCFB5FA /* utils.mm */,
+				C94DC3402FAE3C4FA776DEEA /* window.mm */,
+				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
+				8555204EBA8930809B732842 /* accesscmn.cpp */,
+				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
+				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
+				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
+				29387393C07C39DB8FF1663B /* artprov.cpp */,
+				24E82A05E9A9323287CDB15B /* artstd.cpp */,
+				9988CBB0772A3539970162FA /* arttango.cpp */,
+				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
+				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
+				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
+				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
+				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
+				4FC2F076657431458896115A /* checkboxcmn.cpp */,
+				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
+				24930711031D35288D28B04B /* choiccmn.cpp */,
+				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
+				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
+				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
+				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
+				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
+				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
+				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
+				B3645350F572364BABF50238 /* containr.cpp */,
+				67DCEEB6861731319C30817F /* cshelp.cpp */,
+				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
+				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
+				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
+				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
+				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
+				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
+				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
+				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
+				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
+				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
+				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
+				AB634FD597793A74B3B3AA7F /* docview.cpp */,
+				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
+				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
+				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
+				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
+				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
+				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
+				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
+				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
+				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
+				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
+				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
 				BACAA6CE4A0934459F26B27C /* graphicc.cpp */,
+				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
+				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
+				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
+				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
+				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
+				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
+				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
+				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
+				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
+				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
+				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
+				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
+				BBB30516233A39BE809405AA /* helpbase.cpp */,
+				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
+				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
+				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
+				81A30C745CA73E30B788B408 /* image.cpp */,
+				137E01C362E134449BF966ED /* imagfill.cpp */,
+				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
+				A4A745D1821A32D591D76650 /* imagiff.cpp */,
+				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
+				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
+				24396D584D053948A3FF0DCD /* imagpng.cpp */,
+				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
+				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
+				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
+				5C85865D28DC31649440A921 /* imagxpm.cpp */,
+				BEB08798C70E33DDB360E563 /* layout.cpp */,
+				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
+				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
+				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
+				EF330EAACFA53877BE289896 /* matrix.cpp */,
+				F175D6E8E5723FC797701275 /* menucmn.cpp */,
+				58E7C516E2453A269280A404 /* modalhook.cpp */,
+				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
+				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
+				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
+				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
+				87D973CA8D673267BD0844D3 /* paper.cpp */,
+				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
+				22D9626646773CED82449D5D /* persist.cpp */,
+				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
+				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
+				A046179831F63824A67B509B /* preferencescmn.cpp */,
+				242BF97B558634A79322052C /* prntbase.cpp */,
+				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
+				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
+				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
+				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
+				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
+				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
+				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
+				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
+				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
+				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
+				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
+				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
+				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
+				9C87B071E3593A889704F512 /* statbar.cpp */,
+				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
+				D73954EB5397301F87881646 /* statboxcmn.cpp */,
+				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
+				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
+				B180290089B139F18B0C7BBA /* stockitem.cpp */,
+				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
+				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
+				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
+				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
+				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
+				7BA6ADD758693BD180D3275B /* treebase.cpp */,
+				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
+				F7440859617F3B47AF4D3817 /* valgen.cpp */,
+				01BA6D45FE4C381493EB4372 /* validate.cpp */,
+				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
+				684D92E552BE313CBE0A88AA /* valnum.cpp */,
+				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
+				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
+				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
+				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
 				2F94CF171F4532B89FECF475 /* busyinfo.cpp */,
 				5612DBC4125B379DA2B28824 /* buttonbar.cpp */,
 				CF23AF3EFC5731B2A5BCF4A3 /* choicdgg.cpp */,
@@ -2245,13 +2150,22 @@
 				7925E38823563BCDB5565DCF /* treebkg.cpp */,
 				AA90128E29A03CCCA30F4D35 /* vlbox.cpp */,
 				1629FA905F903324AA5BE72C /* vscroll.cpp */,
+				9AD367F1047838A9A7A34DBF /* xmlreshandler.cpp */,
 			);
-			name = src/generic;
+			name = core;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA692 /* src/generic */ = {
+		2FF0B5E0505D3AEA9A4ACF11 /* adv */ = {
 			isa = PBXGroup;
 			children = (
+				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
+				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
+				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
+				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
+				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
+				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
+				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
+				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
 				77D6E66F72443765A2FBE263 /* aboutdlgg.cpp */,
 				36296C259D023EAAA240FC79 /* bannerwindow.cpp */,
 				13FD4A890E9B3BAEBD568C3B /* bmpcboxg.cpp */,
@@ -2278,129 +2192,52 @@
 				5190E3E110443FD29F2474FC /* treelist.cpp */,
 				8F08F70E1EF239999A4D2AC4 /* wizard.cpp */,
 				580AFC66F3003582B43043B1 /* animateg.cpp */,
+				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
+				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
 			);
-			name = src/generic;
+			name = adv;
 			sourceTree = "<group>";
 		};
-		84E0164052A73DE5996EA693 /* src/generic */ = {
+		374BD863E6AD33189B7E4040 /* net */ = {
 			isa = PBXGroup;
 			children = (
-				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
+				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
+				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
+				F84F0DB790A23D92A193D2B4 /* http.cpp */,
+				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
+				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
+				56653FACC7D13804A70556AD /* sckfile.cpp */,
+				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
+				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
+				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
+				49612306912038DDBCABB4DE /* url.cpp */,
+				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
+				4969528429903F15882F5391 /* sockosx.cpp */,
 			);
-			name = src/generic;
+			name = net;
 			sourceTree = "<group>";
 		};
-		88C4F24FE12D3909945430A1 /* src/stc/scintilla/src */ = {
+		42F504C4994C38D7A8F062F4 /* libexpat */ = {
 			isa = PBXGroup;
 			children = (
-				C63C3983BD243D55AF88DD67 /* AutoComplete.cxx */,
-				4F58B88D42A93BD0B74ADF75 /* CallTip.cxx */,
-				274A156457C63EC5801029C2 /* CaseConvert.cxx */,
-				F52DCBC0442233738B39138E /* CaseFolder.cxx */,
-				975E3B6A269434F0A069987D /* Catalogue.cxx */,
-				E860DD54EEBF3119961B7BB1 /* CellBuffer.cxx */,
-				5AFB85719CBC3D60BA2EDC2E /* CharClassify.cxx */,
-				5219A792C6A736F193D4A82F /* ContractionState.cxx */,
-				BF1C44D726E63B18A98006EC /* Decoration.cxx */,
-				71DB140E670738839EC42C2B /* Document.cxx */,
-				DA5E95D498C53A808A8E2EEB /* Editor.cxx */,
-				FD6D2664C05131C3A06E98B4 /* ExternalLexer.cxx */,
-				4FDE5A962FA234FA83A605AD /* Indicator.cxx */,
-				E72CF5F9C1E53BCFAA2BC253 /* KeyMap.cxx */,
-				AF3DF03795153E039B8F1F87 /* LineMarker.cxx */,
-				9389DAF8B91030B7AAB029FF /* PerLine.cxx */,
-				BCD873D873A53BBF955D8A4E /* PositionCache.cxx */,
-				E145FC31ED523B4AA5080A61 /* RESearch.cxx */,
-				7E0DD59CA6F8337C9964F954 /* RunStyles.cxx */,
-				9BB9CE48AE853C47A1D157AE /* ScintillaBase.cxx */,
-				2AF7739C389536F79DAA31E5 /* Selection.cxx */,
-				C28429A964C337A192D76CC8 /* Style.cxx */,
-				1C4ABE16C5A13979827F4F7C /* UniConversion.cxx */,
-				C133B838193A35ABBB803151 /* ViewStyle.cxx */,
-				C25521AF59B9324EB2809C73 /* XPM.cxx */,
+				A92B6033D8233DB1821F193B /* xmlparse.c */,
+				59C6B9849FF6325E890942EF /* xmlrole.c */,
+				8685B8ED68F23DB0B770FD74 /* xmltok.c */,
 			);
-			name = src/stc/scintilla/src;
+			name = libexpat;
 			sourceTree = "<group>";
 		};
-		944EF8E9DF2D3390A0F85659 /* src/html/htmlctrl/webkit */ = {
+		4D98B791E17232D39944F04F /* xml */ = {
 			isa = PBXGroup;
 			children = (
-				2DF2456ED905357B8C1D74D9 /* webkit.mm */,
+				E6AB648BC5173104A96CAE66 /* xml.cpp */,
+				4048A3523EC03409BD899BEF /* xtixml.cpp */,
 			);
-			name = src/html/htmlctrl/webkit;
+			name = xml;
 			sourceTree = "<group>";
 		};
-		98C15055598A3586BDB4FD0F /* src/aui */ = {
-			isa = PBXGroup;
-			children = (
-				26632A254717372BAA4D514D /* framemanager.cpp */,
-				BD709DEB71623974B9836D69 /* dockart.cpp */,
-				A881F49ADCF33C299B041584 /* floatpane.cpp */,
-				A298576700C33F018616E7BD /* auibook.cpp */,
-				05A4437E9697300390FDE14E /* auibar.cpp */,
-				C0155E0C2F6131358D2DA5ED /* tabmdi.cpp */,
-				51054B41BFD83E97BAF76D07 /* tabart.cpp */,
-			);
-			name = src/aui;
-			sourceTree = "<group>";
-		};
-		9A6B5D3E90513D0396CFE0EF /* src/stc */ = {
-			isa = PBXGroup;
-			children = (
-				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
-				47FF6D792CA234C395692118 /* PlatWX.cpp */,
-				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
-			);
-			name = src/stc;
-			sourceTree = "<group>";
-		};
-		A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */ = {
-			isa = PBXGroup;
-			children = (
-				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
-				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
-				F82278F9AF0432529891E6D7 /* tif_close.c */,
-				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
-				149D299A0EDB3D998118EC93 /* tif_color.c */,
-				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
-				E79B2D1F630036129B9677A7 /* tif_dir.c */,
-				032A38738B58394E8617617B /* tif_dirinfo.c */,
-				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
-				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
-				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
-				48F1439BF6C3361296F05A33 /* tif_error.c */,
-				AF7CE00168AB33C994374ABA /* tif_extension.c */,
-				30FD1048328234E59D319863 /* tif_fax3.c */,
-				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
-				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
-				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
-				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
-				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
-				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
-				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
-				3088384F07C63A5DB3581656 /* tif_lzma.c */,
-				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
-				DFDC805DD3063C389F93642D /* tif_next.c */,
-				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
-				1731A6096BFC3A468AB4755A /* tif_open.c */,
-				9CE73979D0933A43830307E4 /* tif_packbits.c */,
-				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
-				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
-				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
-				64B25B87203E3464BCDD277D /* tif_read.c */,
-				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
-				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
-				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
-				BD88495AF72531A28D2201D0 /* tif_tile.c */,
-				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
-				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
-				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
-				726C0457DF1232C793918DC1 /* tif_zip.c */,
-			);
-			name = src/tiff/libtiff;
-			sourceTree = "<group>";
-		};
-		A7471B15D7093D38B8649962 /* src/zlib */ = {
+		52DDFBAA5ACC394FB6B30E74 /* libzlib */ = {
 			isa = PBXGroup;
 			children = (
 				0E45F6DF601A34BCB3CC0206 /* adler32.c */,
@@ -2419,89 +2256,92 @@
 				513033E36E643593AC305B3D /* uncompr.c */,
 				4CB467F9898C3952A68D988B /* zutil.c */,
 			);
-			name = src/zlib;
+			name = libzlib;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908046 /* src/osx/core */ = {
+		5C5CD199E7573C73AE6F392D /* media */ = {
 			isa = PBXGroup;
 			children = (
-				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
-				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
-				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
-				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
-				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
-				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
+				C839E49184663A7CBB7EEB06 /* mediactrlcmn.cpp */,
+				6A6A16F9C3B03A7B9077D013 /* mediactrl.mm */,
 			);
-			name = src/osx/core;
+			name = media;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908047 /* src/osx/core */ = {
+		60328E6EA3793DA990E18FC1 /* xrc */ = {
 			isa = PBXGroup;
 			children = (
-				A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
-				9D1F14339D1C331087650931 /* colour.cpp */,
-				343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
-				A5617D10CB7136EC9A4194EF /* display.cpp */,
-				36E1DBA275AD325DB759C180 /* fontenum.cpp */,
-				160EB9744CB63A0B81DC651F /* hid.cpp */,
-				5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
-				69F098E47EBF34368ABAE7ED /* timer.cpp */,
-				95E2B80B2D7033808504DA8D /* utilsexc_cf.cpp */,
-				7B0D3EA68FBE3E42BA4D8B19 /* glgrab.cpp */,
+				8C1E755F2408363288B2CE69 /* xh_animatctrl.cpp */,
+				3116006345D833509865FF7F /* xh_bannerwindow.cpp */,
+				07CDBBC10C8E37BBA8600DD6 /* xh_bmp.cpp */,
+				8826A683573F35EA9789612C /* xh_bmpcbox.cpp */,
+				11AE4D94B791344AB6BF6397 /* xh_bmpbt.cpp */,
+				0785AD527D033586A7DCE8B8 /* xh_bttn.cpp */,
+				093B5233861B3F9B8C85762B /* xh_cald.cpp */,
+				BB7DBBD53BA837D2B01CE2B6 /* xh_chckb.cpp */,
+				EA3F8832890138E9AB6E65D8 /* xh_chckl.cpp */,
+				89EC3C6F9AEF3F6DA7CEB3B3 /* xh_choic.cpp */,
+				CCED0C7EF69A31A4A9240D60 /* xh_choicbk.cpp */,
+				AACFDE3263CE3E728AFC47DF /* xh_clrpicker.cpp */,
+				D0B70966E9423F198C8CBE65 /* xh_cmdlinkbn.cpp */,
+				F8638A6CCF773CCFB70DFC29 /* xh_collpane.cpp */,
+				F0905A1EBD653F6D82395602 /* xh_combo.cpp */,
+				5FC445EFDC503C74A5CC6D7D /* xh_comboctrl.cpp */,
+				C63C964DAFAD311694367C94 /* xh_datectrl.cpp */,
+				BD169D8019A13A11BDB26214 /* xh_dirpicker.cpp */,
+				06B4A895955B32258DCD62BF /* xh_dlg.cpp */,
+				05310A868F0B35999C568681 /* xh_editlbox.cpp */,
+				60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */,
+				5C8CEE782CD236A5A9999724 /* xh_filepicker.cpp */,
+				87E609641B583666AB9D1D58 /* xh_fontpicker.cpp */,
+				E5A9B63746753EDFB2EC48D3 /* xh_frame.cpp */,
+				9A23D41D747D38BF8AD30067 /* xh_gauge.cpp */,
+				84A2E6F103403BBFADD449FE /* xh_gdctl.cpp */,
+				93B77251C0E0382D9A8E113D /* xh_grid.cpp */,
+				889FFA9573A835F280A21CB4 /* xh_html.cpp */,
+				B4E4032CA9883CA4B25BE082 /* xh_hyperlink.cpp */,
+				B4DCCF66D880330A9EE9B6B2 /* xh_listb.cpp */,
+				57EB0085AFB93BFC88AC6FFC /* xh_listbk.cpp */,
+				5F5D02D60DCA35358B2780C7 /* xh_listc.cpp */,
+				9AFCEB1FFA3037458F132CAB /* xh_mdi.cpp */,
+				D3078CDAEB863CFD84EDD3BB /* xh_menu.cpp */,
+				A87662D69F0432FC96701280 /* xh_notbk.cpp */,
+				0080254545B9383ABDF2045C /* xh_odcombo.cpp */,
+				F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */,
+				49BF55FA3427335097F99A2C /* xh_propdlg.cpp */,
+				5AACC1EC2E2A33B3ABF5EDCA /* xh_radbt.cpp */,
+				F43AF44465B335479752116D /* xh_radbx.cpp */,
+				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 */,
+				EEADAA811BBF3CBBB9E254FD /* xh_split.cpp */,
+				FD55F391CD1032DFACA88CFD /* xh_srchctrl.cpp */,
+				FADE850169F7347F83FE1499 /* xh_statbar.cpp */,
+				832DDCA57DEE3FD1B34829EC /* xh_stbmp.cpp */,
+				147800BBCB80346798B35D75 /* xh_stbox.cpp */,
+				5F555177554E398286DBC6FB /* xh_stlin.cpp */,
+				B3F1680BBE8331A7B745638C /* xh_sttxt.cpp */,
+				53B95C9A1BCB30CC87495DA3 /* xh_text.cpp */,
+				CDA232B9FFD33B7482E69B58 /* xh_tglbtn.cpp */,
+				25A81E9028793C109D868068 /* xh_timectrl.cpp */,
+				3BFC1F090EFE30B784CE4C64 /* xh_toolb.cpp */,
+				B17FC30EF9D035689B68C955 /* xh_toolbk.cpp */,
+				21A697F65B1E31168F0A7BD7 /* xh_tree.cpp */,
+				B912D2E3385E365CAB61A7FF /* xh_treebk.cpp */,
+				15FCCD1B587637DDA3C1748A /* xh_unkwn.cpp */,
+				EBD381E57BAE3F2AA31A68CB /* xh_wizrd.cpp */,
+				087B66573CD33DA99DA82B1C /* xmlres.cpp */,
+				A1E1A01885B036C28EBDAE27 /* xmladv.cpp */,
+				29922DF1D0D63C33A186E783 /* xmlrsall.cpp */,
 			);
-			name = src/osx/core;
+			name = xrc;
 			sourceTree = "<group>";
 		};
-		AC04244D4E183DF480908048 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				4969528429903F15882F5391 /* sockosx.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		AC04244D4E183DF480908049 /* src/osx/core */ = {
-			isa = PBXGroup;
-			children = (
-				2ACC8667173D3AB09F6214F4 /* sound.cpp */,
-			);
-			name = src/osx/core;
-			sourceTree = "<group>";
-		};
-		B1EF68113C6338CFBBED0FBE /* libregex */ = {
-			isa = PBXGroup;
-			children = (
-				4B7A97D6D29E3627B312E104 /* src/regex */,
-			);
-			name = libregex;
-			sourceTree = "<group>";
-		};
-		B402B38DB4CF3883AF4743C0 /* src/ribbon */ = {
-			isa = PBXGroup;
-			children = (
-				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
-				B540E18F9C91381CA175BABB /* art_msw.cpp */,
-				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
-				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
-				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
-				12363D1F50FE301DAEE7F04B /* control.cpp */,
-				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
-				59ED0C057D8F388A89DC7177 /* page.cpp */,
-				00969CBE3B8F32C78C195619 /* panel.cpp */,
-				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
-			);
-			name = src/ribbon;
-			sourceTree = "<group>";
-		};
-		B8F95052522B37AB86DA8917 /* propgrid */ = {
-			isa = PBXGroup;
-			children = (
-				318BFB22ACCA37E19A1BD431 /* src/propgrid */,
-			);
-			name = propgrid;
-			sourceTree = "<group>";
-		};
-		B8FCB2D33F3B3E30A75D7ABD /* src/html */ = {
+		60E51BFF5CD2327483201F14 /* html */ = {
 			isa = PBXGroup;
 			children = (
 				2E24C6F2A04E30EB95598305 /* chm.cpp */,
@@ -2529,28 +2369,41 @@
 				082CA018FB883999839C1DCE /* m_tables.cpp */,
 				3ABD697F99673F16A0B2D4C1 /* styleparams.cpp */,
 				7FCA75FE592C3469AE351FBF /* winpars.cpp */,
+				FD5F11A3646F397BA62EB037 /* htmllbox.cpp */,
 			);
-			name = src/html;
+			name = html;
 			sourceTree = "<group>";
 		};
-		B9C1A00FC2703E71906209D0 /* src/stc/scintilla/lexlib */ = {
+		62E50658BDAD369D92294F68 /* webview */ = {
 			isa = PBXGroup;
 			children = (
-				D2DE67C976CF3004A8FE883A /* Accessor.cxx */,
-				308B9C05F5A839B5BE8ACBE9 /* CharacterCategory.cxx */,
-				B883F991159731DCB2717A21 /* CharacterSet.cxx */,
-				93EDB3A2B85E3275A6D27C56 /* LexerBase.cxx */,
-				DF5A2C3521A43C9CBBB3C878 /* LexerModule.cxx */,
-				267DB0E799183294B707A39D /* LexerNoExceptions.cxx */,
-				CF502E0E4D853CBBBEC885EF /* LexerSimple.cxx */,
-				41D75DF4695B361DB700D51D /* PropSetSimple.cxx */,
-				9720FFA4490D3AC38E53BE03 /* StyleContext.cxx */,
-				0E7BF9256DF533EBAE2B945E /* WordList.cxx */,
+				5FEECFD764E037288CE94FEB /* webview_webkit.mm */,
+				0DA80913C0E33144A42BD30F /* webview.cpp */,
+				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
+				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
 			);
-			name = src/stc/scintilla/lexlib;
+			name = webview;
 			sourceTree = "<group>";
 		};
-		C1D1DDEBCD103A95BE0B52D4 /* src/png */ = {
+		64B126D857113F24BA8C4758 /* richtext */ = {
+			isa = PBXGroup;
+			children = (
+				47F5E77F7B8D3ABBA365F112 /* richtextbuffer.cpp */,
+				FDEC1C66E6E83C69AF2732DB /* richtextctrl.cpp */,
+				C978558AE31D3CFA85B3BBE3 /* richtextformatdlg.cpp */,
+				7969963AA93537FCA4F54DA7 /* richtexthtml.cpp */,
+				1CE9B3DD54AD318FAA821732 /* richtextimagedlg.cpp */,
+				C4C45D3C63AA37CEBCE83321 /* richtextprint.cpp */,
+				23839659AC2A383CB383F0EC /* richtextstyledlg.cpp */,
+				D30617843F33310089C1F77A /* richtextstyles.cpp */,
+				BB3FF9FECCB5300A9561CE36 /* richtextsymboldlg.cpp */,
+				C69E48C06BD23C178F650E42 /* richtextxml.cpp */,
+				88C2B895570936A3B4FAF3CF /* xh_richtext.cpp */,
+			);
+			name = richtext;
+			sourceTree = "<group>";
+		};
+		6E2C8858F68E3FB0BEFFFCE5 /* libpng */ = {
 			isa = PBXGroup;
 			children = (
 				AF26BAB1F4733114926F1724 /* png.c */,
@@ -2569,93 +2422,10 @@
 				0964797530CF3FE7B8DB6242 /* pngwtran.c */,
 				45D7558DF5E03A2EB41883F0 /* pngwutil.c */,
 			);
-			name = src/png;
+			name = libpng;
 			sourceTree = "<group>";
 		};
-		C23A03BC68833F7E8BA62CF1 /* src/xml */ = {
-			isa = PBXGroup;
-			children = (
-				E6AB648BC5173104A96CAE66 /* xml.cpp */,
-			);
-			name = src/xml;
-			sourceTree = "<group>";
-		};
-		C2FC1A9BBB8C3046994369BF /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1120 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
-				F7332A03D93D3DABB050615D /* dir.cpp */,
-				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
-				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
-				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
-				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
-				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
-				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
-				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
-				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
-				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
-				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
-				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
-				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1121 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				D4A23A8BC7373D4BBD72851D /* apptraits.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		CBC07D2BC2363BB4B61D1122 /* src/unix */ = {
-			isa = PBXGroup;
-			children = (
-				BB7661E9E09A397790ED9545 /* sockunix.cpp */,
-			);
-			name = src/unix;
-			sourceTree = "<group>";
-		};
-		D1F5E5C8429235E68E4AC902 /* src/osx/iphone */ = {
-			isa = PBXGroup;
-			children = (
-				F4020D790AE7363CB29F1C2F /* anybutton.mm */,
-				C06FED83BF933DF98C2466AE /* button.mm */,
-				81708CFA21A03013ACB8DDD7 /* checkbox.mm */,
-				83B878A16ABC396E8C03A15E /* dialog.mm */,
-				8D2549709E0133C9A267E3A5 /* evtloop.mm */,
-				98A7F0605AAC3D28A8C9F253 /* gauge.mm */,
-				33CFE51FD6F0362092DF1A85 /* msgdlg.mm */,
-				AECB45CEAC093CE4AB4B7E45 /* nonownedwnd.mm */,
-				CC2E24773D853A77B9FEFA4C /* scrolbar.mm */,
-				9B862D1027C4367BBF44420F /* slider.mm */,
-				95186FEF3DEF39D8B1157BD5 /* stattext.mm */,
-				E4E16323A43E36DC8024EDF1 /* textctrl.mm */,
-				A3BF8C9FF2D5314591329D0D /* toolbar.mm */,
-				789F45D14FF23E248FCFB5FA /* utils.mm */,
-				C94DC3402FAE3C4FA776DEEA /* window.mm */,
-			);
-			name = src/osx/iphone;
-			sourceTree = "<group>";
-		};
-		D1F5E5C8429235E68E4AC903 /* src/osx/iphone */ = {
-			isa = PBXGroup;
-			children = (
-				35007225BB683683AA7C5E48 /* glcanvas.mm */,
-			);
-			name = src/osx/iphone;
-			sourceTree = "<group>";
-		};
-		D85137B3D94F34B6B3686909 /* src/jpeg */ = {
+		7650A73F7FC9305EA62DAE86 /* libjpeg */ = {
 			isa = PBXGroup;
 			children = (
 				8EB76F786D7F3FF286948D22 /* jcomapi.c */,
@@ -2705,10 +2475,28 @@
 				02D9332D5C5632E981936E29 /* jquant2.c */,
 				0890779C662C35889A8C6C2E /* jdmerge.c */,
 			);
-			name = src/jpeg;
+			name = libjpeg;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D6 /* src/common */ = {
+		816DD323A67F3B299C8F3481 /* opengl */ = {
+			isa = PBXGroup;
+			children = (
+				E08A51FA8D8A361681B07295 /* glcmn.cpp */,
+				35007225BB683683AA7C5E48 /* glcanvas.mm */,
+				FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */,
+			);
+			name = opengl;
+			sourceTree = "<group>";
+		};
+		82F403E7B8653CBD908BC258 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				F190B80DD28031A98E5BCA67 /* Foundation.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		83F62FA47C9636169F1E18E8 /* base */ = {
 			isa = PBXGroup;
 			children = (
 				4867546E8B8D3C8683A23ED5 /* any.cpp */,
@@ -2797,221 +2585,77 @@
 				54FB8A5FCBD0309AAC2E4F70 /* zipstrm.cpp */,
 				B9B5BC858CCF3477895D2786 /* zstream.cpp */,
 				7D2BE094D90D3AFDAE49F589 /* fswatchercmn.cpp */,
+				47783A330B2A3B4EBB1CD95D /* fswatcherg.cpp */,
+				7C97C1F26B5A38C49543060C /* mimetype.cpp */,
+				5168ADF7BE39351F8F24E1E6 /* cfstring.cpp */,
+				5BD6231188AB329CAA5E1171 /* evtloop_cf.cpp */,
+				7B2DEE3EC7CE374DB0CE6EEA /* stdpaths_cf.cpp */,
+				D5F9383D1CE931499F339D85 /* strconv_cf.cpp */,
+				81390F96937631078EFCD891 /* utilsexc_base.cpp */,
 				47F784C2BB5A3B5DAD276583 /* fdiodispatcher.cpp */,
 				A5D569A4DE643DC8B0C28087 /* selectdispatcher.cpp */,
+				B40E0F6AA0273ACD9BDEAD72 /* appunix.cpp */,
+				F7332A03D93D3DABB050615D /* dir.cpp */,
+				CA2D9F325F833C408657E7B7 /* dlunix.cpp */,
+				2EA275DD7D1138F9AE988E45 /* epolldispatcher.cpp */,
+				9E9B79C8C7C4302AA057843E /* evtloopunix.cpp */,
+				3B548B1FF2A238809315C8A9 /* fdiounix.cpp */,
+				3D5D8B68EA743F6E97ADF612 /* snglinst.cpp */,
+				EA2520F427493A22A70A5C09 /* stackwalk.cpp */,
+				F8C1E6D73ABD3A219B2C0603 /* stdpaths.cpp */,
+				0CB2CC8E60833A6993BEA321 /* timerunx.cpp */,
+				AB466912FDA23F8B87A00A3C /* threadpsx.cpp */,
+				DC75C7251C1732B0B07C7BD3 /* utilsunx.cpp */,
+				B38F3D4DC6D139BA93401F7A /* wakeuppipe.cpp */,
+				C019CE87CF9931B0B77C0823 /* fswatcher_kqueue.cpp */,
 				7A34C5BBBA543DC0A50DE1B6 /* event.cpp */,
 				C9A305CEC03B3085B159B617 /* fs_mem.cpp */,
 				E968913A9A593B258BD8EACB /* msgout.cpp */,
 				4188821BBA833CCAA678B234 /* utilscmn.cpp */,
 			);
-			name = src/common;
+			name = base;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D7 /* src/common */ = {
+		B1EF68113C6338CFBBED0FBE /* libregex */ = {
 			isa = PBXGroup;
 			children = (
-				A436B55DC44E3827A757A6D8 /* accelcmn.cpp */,
-				8555204EBA8930809B732842 /* accesscmn.cpp */,
-				EE959EC7BFDD3A628E856404 /* anidecod.cpp */,
-				DD09A813E10A31C19554B425 /* affinematrix2d.cpp */,
-				F01DDE448E4C3983ACCE67FD /* appcmn.cpp */,
-				29387393C07C39DB8FF1663B /* artprov.cpp */,
-				24E82A05E9A9323287CDB15B /* artstd.cpp */,
-				9988CBB0772A3539970162FA /* arttango.cpp */,
-				E8EE191DC59F362AAED2CDC1 /* bmpbase.cpp */,
-				772AD4682A3E38538511D341 /* bmpbtncmn.cpp */,
-				00BC2298BC7A33B7A68584FE /* bookctrl.cpp */,
-				84A7A3B499503ECABC6A838F /* btncmn.cpp */,
-				5DBE56B153AA3AC8A4BBE77C /* cairo.cpp */,
-				4FC2F076657431458896115A /* checkboxcmn.cpp */,
-				83A94241BCB13767AFEC5946 /* checklstcmn.cpp */,
-				24930711031D35288D28B04B /* choiccmn.cpp */,
-				239D386E9D7D39C5A1E859C6 /* clipcmn.cpp */,
-				AB8A747FB60239B9AB710264 /* clrpickercmn.cpp */,
-				2D61240ABD70328BA5789663 /* colourcmn.cpp */,
-				0D3BD03BCE953D1B964EDB7A /* colourdata.cpp */,
-				06BB94FBD5E23872BE5AB4A3 /* combocmn.cpp */,
-				4A5FF9CED1FE36069FDBF636 /* cmdproc.cpp */,
-				0510EE0FB3FF36EF8670ABD1 /* cmndata.cpp */,
-				B3645350F572364BABF50238 /* containr.cpp */,
-				67DCEEB6861731319C30817F /* cshelp.cpp */,
-				0EB91E8407CB3300A19F387D /* ctrlcmn.cpp */,
-				1B0533F88F3434609A54FB37 /* ctrlsub.cpp */,
-				D1EE17722EA937E88A7F0C01 /* dcbase.cpp */,
-				FBC5A5797B0D369291A76D6E /* dcbufcmn.cpp */,
-				776CD7F5B0673B4688F2EC92 /* dcgraph.cpp */,
-				DE9DBF06A1F43EF2B26445D5 /* dcsvg.cpp */,
-				E110907DDC13305E88B90086 /* dirctrlcmn.cpp */,
-				9051902662BE38B3912B34EA /* dlgcmn.cpp */,
-				0116581B77DF3A5D889B8D17 /* dndcmn.cpp */,
-				3E93DE2F9FE73AD2AB9571E2 /* dobjcmn.cpp */,
-				ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */,
-				AB634FD597793A74B3B3AA7F /* docview.cpp */,
-				A37E3D1FB4FB31AFAE88665A /* dpycmn.cpp */,
-				1197B997B1D139C5AE4D198A /* dseldlg.cpp */,
-				48D72D20DB1D3E1CA5ED112A /* effects.cpp */,
-				EDC7345501033EC3AAD53D5F /* fddlgcmn.cpp */,
-				5A756B733D093B09BE2098A6 /* filectrlcmn.cpp */,
-				D7B3307E56B332769901E99F /* filehistorycmn.cpp */,
-				BFA50405234C30EEA3F77F17 /* filepickercmn.cpp */,
-				A9D5CF9CC4553336916FB27B /* fontpickercmn.cpp */,
-				45E7EC6D0C0E3C878664C0A9 /* fldlgcmn.cpp */,
-				30C0FB3166DD31A893AE98E2 /* fontcmn.cpp */,
-				C049D0CFFF0D34E591E1FEA1 /* fontdata.cpp */,
-				373242CD08F330208A7CF438 /* fontenumcmn.cpp */,
-				D0817D6A1AF83608B050EBC3 /* fontmap.cpp */,
-				2E00E14795F23A8392713A26 /* fontutilcmn.cpp */,
-				A54B80C17F823CB5900AD2E8 /* framecmn.cpp */,
-				570D603125ED3A14848FA2E2 /* gaugecmn.cpp */,
-				1E2FEBCEED2D33CFAAF75206 /* gbsizer.cpp */,
-				998D611109EC33A9A6A11C5A /* gdicmn.cpp */,
-				6BC0A61629E635FAB4E09505 /* geometry.cpp */,
-				16FE98EC26223BF0A78AB2EE /* gifdecod.cpp */,
-				1BB59DD194923D6399087A75 /* graphcmn.cpp */,
-				B558F1ED9346332D8C4BDFBC /* headercolcmn.cpp */,
-				A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */,
-				BBB30516233A39BE809405AA /* helpbase.cpp */,
-				DBFB65776C563C88BB7BF0D6 /* iconbndl.cpp */,
-				8FFDFB4D208F37569AC548B0 /* imagall.cpp */,
-				5F84098A475939BB9EE87E70 /* imagbmp.cpp */,
-				81A30C745CA73E30B788B408 /* image.cpp */,
-				137E01C362E134449BF966ED /* imagfill.cpp */,
-				CDB4AB7CDABA3A54B4F8207B /* imaggif.cpp */,
-				A4A745D1821A32D591D76650 /* imagiff.cpp */,
-				6876262846EA3569B36D92E9 /* imagjpeg.cpp */,
-				10ED6D770A5A349AA4EE9747 /* imagpcx.cpp */,
-				24396D584D053948A3FF0DCD /* imagpng.cpp */,
-				BC12B97F233B3B9494DA217F /* imagpnm.cpp */,
-				FA7029BB5751398AA02D8C24 /* imagtga.cpp */,
-				AFA85C8E426C361F9CA9D15F /* imagtiff.cpp */,
-				5C85865D28DC31649440A921 /* imagxpm.cpp */,
-				BEB08798C70E33DDB360E563 /* layout.cpp */,
-				9660AE8FEB7B3EDB857B9238 /* lboxcmn.cpp */,
-				E1B1FBB2BCC43BA7A45E9438 /* listctrlcmn.cpp */,
-				DA7F7633279936EFA0B9C5CF /* markupparser.cpp */,
-				EF330EAACFA53877BE289896 /* matrix.cpp */,
-				F175D6E8E5723FC797701275 /* menucmn.cpp */,
-				58E7C516E2453A269280A404 /* modalhook.cpp */,
-				D037EA567C253DEEA17E822B /* mousemanager.cpp */,
-				B901252876603DCEA4C66D89 /* nbkbase.cpp */,
-				303ACF199BE431BD891C9301 /* overlaycmn.cpp */,
-				155ECF01CC4C318281AAA870 /* ownerdrwcmn.cpp */,
-				87D973CA8D673267BD0844D3 /* paper.cpp */,
-				70E9B2C076673C87B4218A01 /* panelcmn.cpp */,
-				22D9626646773CED82449D5D /* persist.cpp */,
-				1FBC22BAD63D3A1AB78F5F82 /* pickerbase.cpp */,
-				D922063B2F2536629EEEAAF0 /* popupcmn.cpp */,
-				A046179831F63824A67B509B /* preferencescmn.cpp */,
-				242BF97B558634A79322052C /* prntbase.cpp */,
-				B890199A37723EFD86C0ADA5 /* quantize.cpp */,
-				724927B0045F3CC0884878BB /* radiobtncmn.cpp */,
-				531B0E5DB9ED393996E3FBB8 /* radiocmn.cpp */,
-				972BC9B2B0D438EFB12BCE1E /* rearrangectrl.cpp */,
-				96CED508FA3C3B6B9265099E /* rendcmn.cpp */,
-				63867276260C3F4A980E83D8 /* rgncmn.cpp */,
-				A9E441D48CB73EF2BFD6C384 /* scrolbarcmn.cpp */,
-				ABE3DC4AA47D39ACA83F27C0 /* settcmn.cpp */,
-				3C654A08F74B3DBCA96CC2A9 /* sizer.cpp */,
-				E8072CA67D19346ABF4D465F /* slidercmn.cpp */,
-				C668C23A4E9A3A39BEED384E /* spinbtncmn.cpp */,
-				8FAA77ADAB7833648DA5D079 /* spinctrlcmn.cpp */,
-				1EF103B09F02315282EC8F44 /* srchcmn.cpp */,
-				9C87B071E3593A889704F512 /* statbar.cpp */,
-				12EFC31E6FB631998E44B49C /* statbmpcmn.cpp */,
-				D73954EB5397301F87881646 /* statboxcmn.cpp */,
-				292C08C0A1203654ABAA2CB1 /* statlinecmn.cpp */,
-				54BD19211DBD388AA0DEC7A1 /* stattextcmn.cpp */,
-				B180290089B139F18B0C7BBA /* stockitem.cpp */,
-				D3F32C01D122301AB00D06A5 /* tbarbase.cpp */,
-				3DFD4F32E48039C3B9A66355 /* textcmn.cpp */,
-				5F63BF9430CE371DA04AC900 /* textentrycmn.cpp */,
-				BEC69FC5D7F73759A0670C4A /* textmeasurecmn.cpp */,
-				861438BD294335D4B859EA71 /* toplvcmn.cpp */,
-				7BA6ADD758693BD180D3275B /* treebase.cpp */,
-				A87BF60D0D4A33E2AD2E1E25 /* uiactioncmn.cpp */,
-				F7440859617F3B47AF4D3817 /* valgen.cpp */,
-				01BA6D45FE4C381493EB4372 /* validate.cpp */,
-				DE8701E1CF2B352B945C17E5 /* valtext.cpp */,
-				684D92E552BE313CBE0A88AA /* valnum.cpp */,
-				AC5C60B3AF893BE98BCE6C1D /* wincmn.cpp */,
-				E9B9B85572D0312BBF2878DB /* windowid.cpp */,
-				B5E2D6917EB1352983C7FE85 /* wrapsizer.cpp */,
-				C562D5885AFF3E15837325CE /* xpmdecod.cpp */,
+				E433B890264339BA8DB97B1D /* regcomp.c */,
+				1482A34AC32133E4BE207223 /* regexec.c */,
+				A70C82ADB45A3FB99C420D03 /* regerror.c */,
+				EEE82083BFA430D5B58F8A04 /* regfree.c */,
 			);
-			name = src/common;
+			name = libregex;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D8 /* src/common */ = {
+		B8F95052522B37AB86DA8917 /* propgrid */ = {
 			isa = PBXGroup;
 			children = (
-				B7581D7140293BAE88E43DBE /* fs_inet.cpp */,
-				5CB4781DF8C432C688F30CDD /* ftp.cpp */,
-				F84F0DB790A23D92A193D2B4 /* http.cpp */,
-				7B389A14D6BF3AFD8CCE0807 /* protocol.cpp */,
-				DE8238DA30FF3FB984511250 /* sckaddr.cpp */,
-				56653FACC7D13804A70556AD /* sckfile.cpp */,
-				1F6E23CCDC1932BC985EFBD2 /* sckipc.cpp */,
-				D784A32C094730FEAA391A9B /* sckstrm.cpp */,
-				40CE02524DD4385AB2C3DF95 /* socket.cpp */,
-				49612306912038DDBCABB4DE /* url.cpp */,
-				DDE22D7DDAC93DCABAE5AED0 /* socketiohandler.cpp */,
+				326723AEB79A305F90D6B41D /* advprops.cpp */,
+				A9C7F740A55E39FD890B3C7F /* editors.cpp */,
+				EBED392D081335FA80523244 /* manager.cpp */,
+				58E1F571B01F34D4AB70CA18 /* property.cpp */,
+				B98B72B3A0A73044B85AED60 /* propgrid.cpp */,
+				69E742B172463EDFBBFA5AB0 /* propgridiface.cpp */,
+				967EF76827CB3CDE87E1E733 /* propgridpagestate.cpp */,
+				C20E46A504113C899B9DD9B7 /* props.cpp */,
 			);
-			name = src/common;
+			name = propgrid;
 			sourceTree = "<group>";
 		};
-		D957B1B354FC327288FDF9D9 /* src/common */ = {
+		C2FC1A9BBB8C3046994369BF /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				A8ABD099BCEA30DCBF7A04F4 /* animatecmn.cpp */,
-				8CF560E06F2A3B6088203D09 /* bmpcboxcmn.cpp */,
-				8D0EF4BDCB5F329ABE15EEED /* calctrlcmn.cpp */,
-				95DEEF60B1E9358A8CCCC67E /* datavcmn.cpp */,
-				FDD3CE34439B3D2BBD9DC8D3 /* gridcmn.cpp */,
-				8A7D521FE5B437D7AD5F4B54 /* hyperlnkcmn.cpp */,
-				6F23140777B733679D2FAAFC /* odcombocmn.cpp */,
-				7A1CE0B28CB73F90AE92B5AB /* richtooltipcmn.cpp */,
+				B4DEA098A05736AE94F01926 /* libwx_osx_iphone.a */,
 			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DA /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				0DA80913C0E33144A42BD30F /* webview.cpp */,
-				70112AB00E013A35BE974FF1 /* webviewarchivehandler.cpp */,
-				CFBDB327E4A236A3ABFA326F /* webviewfshandler.cpp */,
-			);
-			name = src/common;
-			sourceTree = "<group>";
-		};
-		D957B1B354FC327288FDF9DB /* src/common */ = {
-			isa = PBXGroup;
-			children = (
-				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 */,
-			);
-			name = src/common;
+			name = Products;
 			sourceTree = "<group>";
 		};
 		E96566B813153B4295AD767B /* stc */ = {
 			isa = PBXGroup;
 			children = (
-				9A6B5D3E90513D0396CFE0EF /* src/stc */,
+				D0B9C41A4D12345AAA764CAD /* stc.cpp */,
+				47FF6D792CA234C395692118 /* PlatWX.cpp */,
+				8E6F9D4319F639BE89E5A82F /* ScintillaWX.cpp */,
 			);
 			name = stc;
 			sourceTree = "<group>";
@@ -3019,88 +2663,63 @@
 		EB288BE7E74B3328B762A461 /* libtiff */ = {
 			isa = PBXGroup;
 			children = (
-				A6D87CC044BB3FFE9D79072A /* src/tiff/libtiff */,
+				5D2F8259CC99380CB8217DEF /* tif_unix.c */,
+				D0CDADAF2D893E32A38351E4 /* tif_aux.c */,
+				F82278F9AF0432529891E6D7 /* tif_close.c */,
+				88FF67EB6E7D302A9CDEF660 /* tif_codec.c */,
+				149D299A0EDB3D998118EC93 /* tif_color.c */,
+				CA0D5D47D62A3148BA51B31B /* tif_compress.c */,
+				E79B2D1F630036129B9677A7 /* tif_dir.c */,
+				032A38738B58394E8617617B /* tif_dirinfo.c */,
+				F6EA240B3DB93D398A990FAD /* tif_dirread.c */,
+				B9FD5AE12CA9376883AEE4FC /* tif_dirwrite.c */,
+				1094F7D0E7A93B0CAC949001 /* tif_dumpmode.c */,
+				48F1439BF6C3361296F05A33 /* tif_error.c */,
+				AF7CE00168AB33C994374ABA /* tif_extension.c */,
+				30FD1048328234E59D319863 /* tif_fax3.c */,
+				BFF8216871643FEA8B5D7804 /* tif_fax3sm.c */,
+				305614D19CF23CB2B14A5B2E /* tif_flush.c */,
+				3D82E7D38BB43BB886E2BFA0 /* tif_getimage.c */,
+				F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */,
+				29B9C6D27BE83DB384A108ED /* tif_jpeg.c */,
+				4F768B23D8B535CE8D0BD343 /* tif_jpeg_12.c */,
+				66FDA882451239EA8DF2E0B5 /* tif_luv.c */,
+				3088384F07C63A5DB3581656 /* tif_lzma.c */,
+				346C68F0CCD23823B78267F0 /* tif_lzw.c */,
+				DFDC805DD3063C389F93642D /* tif_next.c */,
+				1FBC6F8B4CA63A0081D6F34A /* tif_ojpeg.c */,
+				1731A6096BFC3A468AB4755A /* tif_open.c */,
+				9CE73979D0933A43830307E4 /* tif_packbits.c */,
+				4071FF90F1D4336C836B2AE4 /* tif_pixarlog.c */,
+				2FA01C426EAF38D3B9ED35AC /* tif_predict.c */,
+				C6EB77ED688E3EE294167EF1 /* tif_print.c */,
+				64B25B87203E3464BCDD277D /* tif_read.c */,
+				B83EDE2D1731311ABDE62F9F /* tif_strip.c */,
+				AAC12B4456E13F57BEA25A5E /* tif_swab.c */,
+				68BEC0AB8A933CF2B5ACA149 /* tif_thunder.c */,
+				BD88495AF72531A28D2201D0 /* tif_tile.c */,
+				3E6F40F4740C3ED29D83E107 /* tif_version.c */,
+				C83C97A1FCC5345896C9D7DE /* tif_warning.c */,
+				E9B992CB6C28339FB0CA5E27 /* tif_write.c */,
+				726C0457DF1232C793918DC1 /* tif_zip.c */,
 			);
 			name = libtiff;
 			sourceTree = "<group>";
 		};
-		F494694AB1FD30DEA2087AFB /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				B0665A40F3FC3F218074C63C /* artmac.cpp */,
-				302A13BC64C238A297F4399F /* brush.cpp */,
-				BDE76674C0F5391BAD2AFA2F /* dialog_osx.cpp */,
-				5FF661188B563D27A11F5716 /* fontutil.cpp */,
-				027D2F04BE933ED6B9BA1518 /* imaglist.cpp */,
-				693F731B7D1730A79485F9EC /* minifram.cpp */,
-				19559DDA007D364E838014B5 /* nonownedwnd_osx.cpp */,
-				BEF6B3FB66243812969E5BD1 /* palette.cpp */,
-				4BA819575B5136B09FA8FEB1 /* pen.cpp */,
-				9E2C8A7034343354841F7D8B /* toplevel_osx.cpp */,
-				AC6359B01A7B35F6B710ACF8 /* uiaction_osx.cpp */,
-				EED7C691150139EFA35E8EBD /* utils_osx.cpp */,
-				26D7C4995D7A35A1854B533F /* window_osx.cpp */,
-				C62CD918A09D3FE5B1BF2D17 /* anybutton_osx.cpp */,
-				38EF5FC5934C34D599FD6074 /* bmpbuttn_osx.cpp */,
-				CF4F4F5211933057824B5621 /* button_osx.cpp */,
-				998C092CB83639CFA3DC63B1 /* checkbox_osx.cpp */,
-				9860CD56245B3E7FBD0E7846 /* checklst_osx.cpp */,
-				59D075A3E96F3187B58F6D03 /* choice_osx.cpp */,
-				543C896D9A30340A8C2CB7C8 /* combobox_osx.cpp */,
-				CA72410F615B3A78A6340532 /* dnd_osx.cpp */,
-				EC28591B403B32B7AFCC079D /* gauge_osx.cpp */,
-				B99CA41708513A599AE275A2 /* listbox_osx.cpp */,
-				66C21CA37BF63893887FD91B /* menu_osx.cpp */,
-				CF6511DE2CB43534A5566403 /* menuitem_osx.cpp */,
-				5248A45AB113341EAC361910 /* notebook_osx.cpp */,
-				9DD609EC0591359C9A576A43 /* printdlg_osx.cpp */,
-				773D91F8280434519BD167EA /* radiobox_osx.cpp */,
-				5FFCB72168FD31DE86A1B674 /* radiobut_osx.cpp */,
-				600740717F7E320F8CA78384 /* scrolbar_osx.cpp */,
-				D215A0D67563350CB4EECB06 /* slider_osx.cpp */,
-				5E2F1BF8904635049BAFD6E1 /* spinbutt_osx.cpp */,
-				7C80A0223B993BCB80D1C0A0 /* srchctrl_osx.cpp */,
-				9F16A18CD9C23410B18592FD /* statbox_osx.cpp */,
-				DE35DFD2063632AA8FE50C89 /* statline_osx.cpp */,
-				7CF5C09D9A1230EEB42713E1 /* stattext_osx.cpp */,
-				777385D10CCC350C90F02824 /* textentry_osx.cpp */,
-				6C0129D2DB2D3431B66FD9C3 /* textctrl_osx.cpp */,
-				1B7308D9C4BA39F19223C82C /* tglbtn_osx.cpp */,
-				6CD29E47B69D3F3482665E77 /* toolbar_osx.cpp */,
-				8C78A1539462370CAA429508 /* accel.cpp */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
-		F494694AB1FD30DEA2087AFC /* src/osx */ = {
-			isa = PBXGroup;
-			children = (
-				A9B2316B32653DA0939A372D /* sound_osx.cpp */,
-			);
-			name = src/osx;
-			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 */,
-			);
-			name = src/osx;
-			sourceTree = "<group>";
-		};
 		FE1C78F1707A30878CBB2B4B /* ribbon */ = {
 			isa = PBXGroup;
 			children = (
-				B402B38DB4CF3883AF4743C0 /* src/ribbon */,
-				348F9A77CB8B315FBC81D215 /* src/xrc */,
+				4C4649974D8B3A109D1BF145 /* art_internal.cpp */,
+				B540E18F9C91381CA175BABB /* art_msw.cpp */,
+				DD5E8709C3BC3727BBC7B97A /* art_aui.cpp */,
+				9FDDE855D9F83E4891362EB4 /* bar.cpp */,
+				5612DBC4125B379DA2B28825 /* buttonbar.cpp */,
+				12363D1F50FE301DAEE7F04B /* control.cpp */,
+				3F1C1EB5C0B3302C86D91315 /* gallery.cpp */,
+				59ED0C057D8F388A89DC7177 /* page.cpp */,
+				00969CBE3B8F32C78C195619 /* panel.cpp */,
+				BE4B0CE56BA23002A5C8AEFF /* toolbar.cpp */,
+				B6A37A02D28E30CD9B83E134 /* xh_ribbon.cpp */,
 			);
 			name = ribbon;
 			sourceTree = "<group>";
@@ -3361,7 +2980,6 @@
 				D088E7DDE38C31DC9C9B3417 /* dcclient.cpp in Sources */,
 				182DFDBB58653FD9863D4176 /* dcprint.cpp in Sources */,
 				AAC2CB4D851230008AE4ABA1 /* dcscreen.cpp in Sources */,
-				939E53CA56F33194B4681117 /* glgrab.cpp in Sources */,
 				774EB9F3F7E93A379E1F7551 /* graphics.cpp in Sources */,
 				5792675690843C6AA4125A72 /* font.cpp in Sources */,
 				BDAB44F5D017395D9D3A1F23 /* frame.cpp in Sources */,
@@ -3623,6 +3241,7 @@
 				5C5D0983160A36189A770742 /* webviewarchivehandler.cpp in Sources */,
 				048986FB629E313EA670CD0C /* webviewfshandler.cpp in Sources */,
 				DEC5F4B34BC037169D3E5F2A /* mediactrlcmn.cpp in Sources */,
+				B6BC23F4F3E43315BD4C7CF8 /* mediactrl.mm in Sources */,
 				47EBBB18BDB539C2A948C711 /* chm.cpp in Sources */,
 				BAA75384DA82370298672333 /* helpctrl.cpp in Sources */,
 				2CAD4DF9505F36E4A2EAD53D /* helpdata.cpp in Sources */,
@@ -3692,6 +3311,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 */,