X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bba35861478a26f5d8c756a9a7fa2bbd19a69cb1..c895624b1353d96d7cf1f1ea9581fe81792499dc:/src/wxWindows.xcodeproj/project.pbxproj?ds=sidebyside

diff --git a/src/wxWindows.xcodeproj/project.pbxproj b/src/wxWindows.xcodeproj/project.pbxproj
index a1c24ea287..de9420dfaa 100644
--- a/src/wxWindows.xcodeproj/project.pbxproj
+++ b/src/wxWindows.xcodeproj/project.pbxproj
@@ -586,7 +586,6 @@
 		4086C7BC063AB2FF00D4CD53 /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8606401FA022C0175ACA7 /* wincmn.cpp */; };
 		4086C7BD063AB2FF00D4CD53 /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8606901FA022C0175ACA7 /* zstream.cpp */; };
 		4086C7BE063AB2FF00D4CD53 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607001FA022C0175ACA7 /* busyinfo.cpp */; };
-		4086C7BF063AB2FF00D4CD53 /* calctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607101FA022C0175ACA7 /* calctrl.cpp */; };
 		4086C7C0063AB2FF00D4CD53 /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607201FA022C0175ACA7 /* caret.cpp */; };
 		4086C7C1063AB2FF00D4CD53 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607301FA022C0175ACA7 /* choicdgg.cpp */; };
 		4086C7C2063AB2FF00D4CD53 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607D01FA022C0175ACA7 /* grid.cpp */; };
@@ -698,9 +697,7 @@
 		4086C831063AB2FF00D4CD53 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AB01FA022C0175ACA7 /* control.cpp */; };
 		4086C832063AB2FF00D4CD53 /* choice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861A601FA022C0175ACA7 /* choice.cpp */; };
 		4086C833063AB2FF00D4CD53 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AD01FA022C0175ACA7 /* cursor.cpp */; };
-		4086C834063AB2FF00D4CD53 /* data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AE01FA022C0175ACA7 /* data.cpp */; };
 		4086C835063AB2FF00D4CD53 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AF01FA022C0175ACA7 /* dataobj.cpp */; };
-		4086C836063AB2FF00D4CD53 /* dc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861B001FA022C0175ACA7 /* dc.cpp */; };
 		4086C837063AB2FF00D4CD53 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861D101FA022C0175ACA7 /* minifram.cpp */; };
 		4086C838063AB2FF00D4CD53 /* mimetmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861D001FA022C0175ACA7 /* mimetmac.cpp */; };
 		4086C839063AB2FF00D4CD53 /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CF01FA022C0175ACA7 /* metafile.cpp */; };
@@ -728,7 +725,6 @@
 		4086C850063AB2FF00D4CD53 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620101FA022C0175ACA7 /* timer.cpp */; };
 		4086C851063AB2FF00D4CD53 /* tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620301FA022C0175ACA7 /* tooltip.cpp */; };
 		4086C852063AB2FF00D4CD53 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620A01FA022C0175ACA7 /* window.cpp */; };
-		4086C853063AB2FF00D4CD53 /* utilsexc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620801FA022C0175ACA7 /* utilsexc.cpp */; };
 		4086C854063AB2FF00D4CD53 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620701FA022C0175ACA7 /* utils.cpp */; };
 		4086C855063AB2FF00D4CD53 /* uma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620601FA022C0175ACA7 /* uma.cpp */; };
 		4086C856063AB2FF00D4CD53 /* toplevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620401FA022C0175ACA7 /* toplevel.cpp */; };
@@ -750,7 +746,6 @@
 		4086C867063AB2FF00D4CD53 /* menuitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CE01FA022C0175ACA7 /* menuitem.cpp */; };
 		4086C868063AB2FF00D4CD53 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CD01FA022C0175ACA7 /* menu.cpp */; };
 		4086C869063AB2FF00D4CD53 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CC01FA022C0175ACA7 /* mdi.cpp */; };
-		4086C86A063AB2FF00D4CD53 /* macnotfy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C801FA022C0175ACA7 /* macnotfy.cpp */; };
 		4086C86B063AB2FF00D4CD53 /* listbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C701FA022C0175ACA7 /* listbox.cpp */; };
 		4086C86D063AB2FF00D4CD53 /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C501FA022C0175ACA7 /* icon.cpp */; };
 		4086C86E063AB2FF00D4CD53 /* taskbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C101FA022C0175ACA7 /* taskbar.cpp */; };
@@ -793,7 +788,6 @@
 		4086C8B5063AB2FF00D4CD53 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176904D43BF100000080 /* init.cpp */; };
 		4086C8B6063AB2FF00D4CD53 /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176C04D43CAA00000080 /* renderg.cpp */; };
 		4086C8B7063AB2FF00D4CD53 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176D04D43CAA00000080 /* selstore.cpp */; };
-		4086C8B8063AB2FF00D4CD53 /* baseunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60177204D43D2300000080 /* baseunix.cpp */; };
 		4086C8B9063AB2FF00D4CD53 /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA89578504D7052700000080 /* rendcmn.cpp */; };
 		4086C8BA063AB2FF00D4CD53 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA89578904D705D700000080 /* m_style.cpp */; };
 		4086C8BB063AB2FF00D4CD53 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA8CC823050E6CD800000080 /* xti.cpp */; };
@@ -922,7 +916,6 @@
 		4086CACF063AB30000D4CD53 /* wincmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8606401FA022C0175ACA7 /* wincmn.cpp */; };
 		4086CAD0063AB30000D4CD53 /* zstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8606901FA022C0175ACA7 /* zstream.cpp */; };
 		4086CAD1063AB30000D4CD53 /* busyinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607001FA022C0175ACA7 /* busyinfo.cpp */; };
-		4086CAD2063AB30000D4CD53 /* calctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607101FA022C0175ACA7 /* calctrl.cpp */; };
 		4086CAD3063AB30000D4CD53 /* caret.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607201FA022C0175ACA7 /* caret.cpp */; };
 		4086CAD4063AB30000D4CD53 /* choicdgg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607301FA022C0175ACA7 /* choicdgg.cpp */; };
 		4086CAD5063AB30000D4CD53 /* grid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8607D01FA022C0175ACA7 /* grid.cpp */; };
@@ -1034,9 +1027,7 @@
 		4086CB44063AB30000D4CD53 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AB01FA022C0175ACA7 /* control.cpp */; };
 		4086CB45063AB30000D4CD53 /* choice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861A601FA022C0175ACA7 /* choice.cpp */; };
 		4086CB46063AB30000D4CD53 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AD01FA022C0175ACA7 /* cursor.cpp */; };
-		4086CB47063AB30000D4CD53 /* data.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AE01FA022C0175ACA7 /* data.cpp */; };
 		4086CB48063AB30000D4CD53 /* dataobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861AF01FA022C0175ACA7 /* dataobj.cpp */; };
-		4086CB49063AB30000D4CD53 /* dc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861B001FA022C0175ACA7 /* dc.cpp */; };
 		4086CB4A063AB30000D4CD53 /* minifram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861D101FA022C0175ACA7 /* minifram.cpp */; };
 		4086CB4B063AB30000D4CD53 /* mimetmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861D001FA022C0175ACA7 /* mimetmac.cpp */; };
 		4086CB4C063AB30000D4CD53 /* metafile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CF01FA022C0175ACA7 /* metafile.cpp */; };
@@ -1064,7 +1055,6 @@
 		4086CB63063AB30000D4CD53 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620101FA022C0175ACA7 /* timer.cpp */; };
 		4086CB64063AB30000D4CD53 /* tooltip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620301FA022C0175ACA7 /* tooltip.cpp */; };
 		4086CB65063AB30000D4CD53 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620A01FA022C0175ACA7 /* window.cpp */; };
-		4086CB66063AB30000D4CD53 /* utilsexc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620801FA022C0175ACA7 /* utilsexc.cpp */; };
 		4086CB67063AB30000D4CD53 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620701FA022C0175ACA7 /* utils.cpp */; };
 		4086CB68063AB30000D4CD53 /* uma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620601FA022C0175ACA7 /* uma.cpp */; };
 		4086CB69063AB30000D4CD53 /* toplevel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A8620401FA022C0175ACA7 /* toplevel.cpp */; };
@@ -1086,7 +1076,6 @@
 		4086CB7A063AB30000D4CD53 /* menuitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CE01FA022C0175ACA7 /* menuitem.cpp */; };
 		4086CB7B063AB30000D4CD53 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CD01FA022C0175ACA7 /* menu.cpp */; };
 		4086CB7C063AB30000D4CD53 /* mdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861CC01FA022C0175ACA7 /* mdi.cpp */; };
-		4086CB7D063AB30000D4CD53 /* macnotfy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C801FA022C0175ACA7 /* macnotfy.cpp */; };
 		4086CB7E063AB30000D4CD53 /* listbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C701FA022C0175ACA7 /* listbox.cpp */; };
 		4086CB80063AB30000D4CD53 /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C501FA022C0175ACA7 /* icon.cpp */; };
 		4086CB81063AB30000D4CD53 /* taskbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861C101FA022C0175ACA7 /* taskbar.cpp */; };
@@ -1121,7 +1110,6 @@
 		4086CBBF063AB30000D4CD53 /* datacmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA0CB57C0450773900000102 /* datacmn.cpp */; };
 		4086CBC0063AB30000D4CD53 /* dpycmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA0CB57D0450773900000102 /* dpycmn.cpp */; };
 		4086CBC1063AB30000D4CD53 /* rgncmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA0CB57E0450773900000102 /* rgncmn.cpp */; };
-		4086CBC2063AB30000D4CD53 /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60175604D43A2700000080 /* appbase.cpp */; };
 		4086CBC4063AB30000D4CD53 /* fldlgcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60175C04D43A8100000080 /* fldlgcmn.cpp */; };
 		4086CBC5063AB30000D4CD53 /* fmapbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60175D04D43A8100000080 /* fmapbase.cpp */; };
 		4086CBC6063AB30000D4CD53 /* stopwatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60175E04D43A8100000080 /* stopwatch.cpp */; };
@@ -1129,7 +1117,6 @@
 		4086CBC8063AB30000D4CD53 /* init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176904D43BF100000080 /* init.cpp */; };
 		4086CBC9063AB30000D4CD53 /* renderg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176C04D43CAA00000080 /* renderg.cpp */; };
 		4086CBCA063AB30000D4CD53 /* selstore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60176D04D43CAA00000080 /* selstore.cpp */; };
-		4086CBCB063AB30000D4CD53 /* baseunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60177204D43D2300000080 /* baseunix.cpp */; };
 		4086CBCC063AB30000D4CD53 /* rendcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA89578504D7052700000080 /* rendcmn.cpp */; };
 		4086CBCD063AB30000D4CD53 /* m_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA89578904D705D700000080 /* m_style.cpp */; };
 		4086CBCE063AB30000D4CD53 /* xti.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA8CC823050E6CD800000080 /* xti.cpp */; };
@@ -1352,12 +1339,10 @@
 		40AF90C307C8AA17006A6D3C /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90C207C8AA17006A6D3C /* chm.cpp */; };
 		40AF90C507C8AA17006A6D3C /* chm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90C207C8AA17006A6D3C /* chm.cpp */; };
 		40AF90E907C8B18C006A6D3C /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E207C8B18C006A6D3C /* colordlgosx.mm */; };
-		40AF90EB07C8B18C006A6D3C /* dccg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E407C8B18C006A6D3C /* dccg.cpp */; };
 		40AF90EC07C8B18C006A6D3C /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E507C8B18C006A6D3C /* drawer.cpp */; };
 		40AF90ED07C8B18C006A6D3C /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E607C8B18C006A6D3C /* fontdlgosx.mm */; };
 		40AF90EF07C8B18C006A6D3C /* mediactrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E807C8B18C006A6D3C /* mediactrl.cpp */; };
 		40AF90F707C8B18C006A6D3C /* colordlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E207C8B18C006A6D3C /* colordlgosx.mm */; };
-		40AF90F907C8B18C006A6D3C /* dccg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E407C8B18C006A6D3C /* dccg.cpp */; };
 		40AF90FA07C8B18C006A6D3C /* drawer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E507C8B18C006A6D3C /* drawer.cpp */; };
 		40AF90FB07C8B18C006A6D3C /* fontdlgosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E607C8B18C006A6D3C /* fontdlgosx.mm */; };
 		40AF90FD07C8B18C006A6D3C /* mediactrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40AF90E807C8B18C006A6D3C /* mediactrl.cpp */; };
@@ -1373,6 +1358,47 @@
 		40C3B3410CCBF3CB00DE0E06 /* timerunx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40C3B33F0CCBF3CB00DE0E06 /* timerunx.cpp */; };
 		40C3B3490CCBF43E00DE0E06 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40C3B3480CCBF43E00DE0E06 /* appunix.cpp */; };
 		40C3B34A0CCBF43E00DE0E06 /* appunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40C3B3480CCBF43E00DE0E06 /* appunix.cpp */; };
+		40CACE4B0DFEF94C00B657E4 /* nonownedwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE490DFEF94C00B657E4 /* nonownedwnd.cpp */; };
+		40CACE4C0DFEF94C00B657E4 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE4A0DFEF94C00B657E4 /* popupwin.cpp */; };
+		40CACE4D0DFEF94C00B657E4 /* nonownedwnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE490DFEF94C00B657E4 /* nonownedwnd.cpp */; };
+		40CACE4E0DFEF94C00B657E4 /* popupwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE4A0DFEF94C00B657E4 /* popupwin.cpp */; };
+		40CACE550DFEF97F00B657E4 /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE540DFEF97F00B657E4 /* calctrlg.cpp */; };
+		40CACE560DFEF97F00B657E4 /* calctrlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE540DFEF97F00B657E4 /* calctrlg.cpp */; };
+		40CACE5D0DFEF9B900B657E4 /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE590DFEF9B900B657E4 /* bmpcboxcmn.cpp */; };
+		40CACE5E0DFEF9B900B657E4 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5A0DFEF9B900B657E4 /* calctrlcmn.cpp */; };
+		40CACE5F0DFEF9B900B657E4 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5B0DFEF9B900B657E4 /* windowid.cpp */; };
+		40CACE600DFEF9B900B657E4 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5C0DFEF9B900B657E4 /* wrapsizer.cpp */; };
+		40CACE610DFEF9B900B657E4 /* bmpcboxcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE590DFEF9B900B657E4 /* bmpcboxcmn.cpp */; };
+		40CACE620DFEF9B900B657E4 /* calctrlcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5A0DFEF9B900B657E4 /* calctrlcmn.cpp */; };
+		40CACE630DFEF9B900B657E4 /* windowid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5B0DFEF9B900B657E4 /* windowid.cpp */; };
+		40CACE640DFEF9B900B657E4 /* wrapsizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE5C0DFEF9B900B657E4 /* wrapsizer.cpp */; };
+		40CACE720DFEFD1200B657E4 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE670DFEFD1100B657E4 /* Decoration.cxx */; };
+		40CACE730DFEFD1200B657E4 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE680DFEFD1100B657E4 /* LexAbaqus.cxx */; };
+		40CACE740DFEFD1200B657E4 /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE690DFEFD1100B657E4 /* LexASY.cxx */; };
+		40CACE750DFEFD1200B657E4 /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6A0DFEFD1100B657E4 /* LexCmake.cxx */; };
+		40CACE760DFEFD1200B657E4 /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6B0DFEFD1100B657E4 /* LexD.cxx */; };
+		40CACE770DFEFD1200B657E4 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6C0DFEFD1100B657E4 /* LexGAP.cxx */; };
+		40CACE780DFEFD1200B657E4 /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6D0DFEFD1200B657E4 /* LexPLM.cxx */; };
+		40CACE790DFEFD1200B657E4 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6E0DFEFD1200B657E4 /* LexProgress.cxx */; };
+		40CACE7A0DFEFD1200B657E4 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6F0DFEFD1200B657E4 /* LexR.cxx */; };
+		40CACE7B0DFEFD1200B657E4 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE700DFEFD1200B657E4 /* PositionCache.cxx */; };
+		40CACE7C0DFEFD1200B657E4 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE710DFEFD1200B657E4 /* RunStyles.cxx */; };
+		40CACE7D0DFEFD1200B657E4 /* Decoration.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE670DFEFD1100B657E4 /* Decoration.cxx */; };
+		40CACE7E0DFEFD1200B657E4 /* LexAbaqus.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE680DFEFD1100B657E4 /* LexAbaqus.cxx */; };
+		40CACE7F0DFEFD1200B657E4 /* LexASY.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE690DFEFD1100B657E4 /* LexASY.cxx */; };
+		40CACE800DFEFD1200B657E4 /* LexCmake.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6A0DFEFD1100B657E4 /* LexCmake.cxx */; };
+		40CACE810DFEFD1200B657E4 /* LexD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6B0DFEFD1100B657E4 /* LexD.cxx */; };
+		40CACE820DFEFD1200B657E4 /* LexGAP.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6C0DFEFD1100B657E4 /* LexGAP.cxx */; };
+		40CACE830DFEFD1200B657E4 /* LexPLM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6D0DFEFD1200B657E4 /* LexPLM.cxx */; };
+		40CACE840DFEFD1200B657E4 /* LexProgress.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6E0DFEFD1200B657E4 /* LexProgress.cxx */; };
+		40CACE850DFEFD1200B657E4 /* LexR.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE6F0DFEFD1200B657E4 /* LexR.cxx */; };
+		40CACE860DFEFD1200B657E4 /* PositionCache.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE700DFEFD1200B657E4 /* PositionCache.cxx */; };
+		40CACE870DFEFD1200B657E4 /* RunStyles.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE710DFEFD1200B657E4 /* RunStyles.cxx */; };
+		40CACE8A0DFEFD5500B657E4 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE890DFEFD5500B657E4 /* apptraits.cpp */; };
+		40CACE8B0DFEFD5500B657E4 /* apptraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACE890DFEFD5500B657E4 /* apptraits.cpp */; };
+		40CACE9D0DFEFF3200B657E4 /* appbase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CA60175604D43A2700000080 /* appbase.cpp */; };
+		40CACEAA0DFF00E200B657E4 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACEA90DFF00E200B657E4 /* evtloopunix.cpp */; };
+		40CACEAB0DFF00E200B657E4 /* evtloopunix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CACEA90DFF00E200B657E4 /* evtloopunix.cpp */; };
 		40CDE8D20982505E00E8156D /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CDE8D00982505E00E8156D /* evtloopcmn.cpp */; };
 		40CDE8D40982505E00E8156D /* evtloopcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CDE8D00982505E00E8156D /* evtloopcmn.cpp */; };
 		40CDE8DA098250AB00E8156D /* evtloop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40CDE8D9098250AB00E8156D /* evtloop.cpp */; };
@@ -1476,8 +1502,8 @@
 		0A98CB6A07146A06007B4289 /* statbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = statbar.cpp; sourceTree = "<group>"; };
 		0A98CC470715CFBC007B4289 /* gdiobj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gdiobj.cpp; sourceTree = "<group>"; };
 		0A98CD2207172992007B4289 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-		40011CBB0893D5B400E4DE95 /* utilsexc_base.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_base.cpp; path = mac/corefoundation/utilsexc_base.cpp; sourceTree = SOURCE_ROOT; };
-		40011F3B0897D8DF00E4DE95 /* setup0.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = setup0.h; path = wx/mac/setup0.h; sourceTree = "<group>"; };
+		40011CBB0893D5B400E4DE95 /* utilsexc_base.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_base.cpp; path = osx/core/utilsexc_base.cpp; sourceTree = SOURCE_ROOT; };
+		40011F3B0897D8DF00E4DE95 /* setup0.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = setup0.h; path = wx/osx/setup0.h; sourceTree = "<group>"; };
 		400226610CE644C0007F534D /* utilscocoa.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = utilscocoa.mm; sourceTree = "<group>"; };
 		400EDEB2089D4FFD00E848D9 /* propdlg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = propdlg.cpp; sourceTree = "<group>"; };
 		401640E507F94B2800A8837A /* imaglist.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = imaglist.cpp; sourceTree = "<group>"; };
@@ -1676,10 +1702,10 @@
 		405415210AB6A0B000450E09 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
 		405DD167063C2BFC00F579EE /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; };
 		40607C1407493C3F00DC0420 /* archive.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = archive.cpp; sourceTree = "<group>"; };
-		40607C740749432A00DC0420 /* gsockosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gsockosx.cpp; path = mac/corefoundation/gsockosx.cpp; sourceTree = SOURCE_ROOT; };
-		40607C750749432A00DC0420 /* utilsexc_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = mac/corefoundation/utilsexc_cf.cpp; sourceTree = SOURCE_ROOT; };
-		40670A8207377A6300F7C08C /* cfstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = mac/corefoundation/cfstring.cpp; sourceTree = SOURCE_ROOT; };
-		40670A8307377A6300F7C08C /* stdpaths_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = mac/corefoundation/stdpaths_cf.cpp; sourceTree = SOURCE_ROOT; };
+		40607C740749432A00DC0420 /* gsockosx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gsockosx.cpp; path = osx/core/gsockosx.cpp; sourceTree = SOURCE_ROOT; };
+		40607C750749432A00DC0420 /* utilsexc_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = utilsexc_cf.cpp; path = osx/core/utilsexc_cf.cpp; sourceTree = SOURCE_ROOT; };
+		40670A8207377A6300F7C08C /* cfstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = cfstring.cpp; path = osx/core/cfstring.cpp; sourceTree = SOURCE_ROOT; };
+		40670A8307377A6300F7C08C /* stdpaths_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = stdpaths_cf.cpp; path = osx/core/stdpaths_cf.cpp; sourceTree = SOURCE_ROOT; };
 		40670A9307377B1000F7C08C /* gbsizer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gbsizer.cpp; sourceTree = "<group>"; };
 		40670A9407377B1000F7C08C /* sstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = sstream.cpp; sourceTree = "<group>"; };
 		40670A9507377B1000F7C08C /* stdpbase.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = stdpbase.cpp; sourceTree = "<group>"; };
@@ -1802,21 +1828,40 @@
 		40AF909707C8A976006A6D3C /* htmllbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = htmllbox.cpp; sourceTree = "<group>"; };
 		40AF909907C8A976006A6D3C /* vlbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vlbox.cpp; sourceTree = "<group>"; };
 		40AF909A07C8A976006A6D3C /* vscroll.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vscroll.cpp; sourceTree = "<group>"; };
-		40AF90B307C8A9CF006A6D3C /* hid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hid.cpp; path = mac/corefoundation/hid.cpp; sourceTree = SOURCE_ROOT; };
-		40AF90B407C8A9CF006A6D3C /* hidjoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hidjoystick.cpp; path = mac/corefoundation/hidjoystick.cpp; sourceTree = SOURCE_ROOT; };
+		40AF90B307C8A9CF006A6D3C /* hid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hid.cpp; path = osx/core/hid.cpp; sourceTree = SOURCE_ROOT; };
+		40AF90B407C8A9CF006A6D3C /* hidjoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = hidjoystick.cpp; path = osx/core/hidjoystick.cpp; sourceTree = SOURCE_ROOT; };
 		40AF90BD07C8AA08006A6D3C /* dlunix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dlunix.cpp; sourceTree = "<group>"; };
 		40AF90C207C8AA17006A6D3C /* chm.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = chm.cpp; sourceTree = "<group>"; };
 		40AF90E207C8B18C006A6D3C /* colordlgosx.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = colordlgosx.mm; sourceTree = "<group>"; };
-		40AF90E407C8B18C006A6D3C /* dccg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dccg.cpp; sourceTree = "<group>"; };
 		40AF90E507C8B18C006A6D3C /* drawer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = drawer.cpp; sourceTree = "<group>"; };
 		40AF90E607C8B18C006A6D3C /* fontdlgosx.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = fontdlgosx.mm; sourceTree = "<group>"; };
 		40AF90E807C8B18C006A6D3C /* mediactrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mediactrl.cpp; sourceTree = "<group>"; };
 		40AF913507C8BD1F006A6D3C /* combobox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = combobox.cpp; sourceTree = "<group>"; };
 		40C3B3110CCBF0BB00DE0E06 /* timerimpl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = timerimpl.cpp; sourceTree = "<group>"; };
-		40C3B31F0CCBF20900DE0E06 /* strconv_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = strconv_cf.cpp; path = mac/corefoundation/strconv_cf.cpp; sourceTree = SOURCE_ROOT; };
+		40C3B31F0CCBF20900DE0E06 /* strconv_cf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = strconv_cf.cpp; path = osx/core/strconv_cf.cpp; sourceTree = SOURCE_ROOT; };
 		40C3B32A0CCBF23800DE0E06 /* accelcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = accelcmn.cpp; sourceTree = "<group>"; };
 		40C3B33F0CCBF3CB00DE0E06 /* timerunx.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = timerunx.cpp; sourceTree = "<group>"; };
 		40C3B3480CCBF43E00DE0E06 /* appunix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = appunix.cpp; sourceTree = "<group>"; };
+		40CACE490DFEF94C00B657E4 /* nonownedwnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nonownedwnd.cpp; sourceTree = "<group>"; };
+		40CACE4A0DFEF94C00B657E4 /* popupwin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popupwin.cpp; sourceTree = "<group>"; };
+		40CACE540DFEF97F00B657E4 /* calctrlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = calctrlg.cpp; sourceTree = "<group>"; };
+		40CACE590DFEF9B900B657E4 /* bmpcboxcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bmpcboxcmn.cpp; sourceTree = "<group>"; };
+		40CACE5A0DFEF9B900B657E4 /* calctrlcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = calctrlcmn.cpp; sourceTree = "<group>"; };
+		40CACE5B0DFEF9B900B657E4 /* windowid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = windowid.cpp; sourceTree = "<group>"; };
+		40CACE5C0DFEF9B900B657E4 /* wrapsizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wrapsizer.cpp; sourceTree = "<group>"; };
+		40CACE670DFEFD1100B657E4 /* Decoration.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decoration.cxx; sourceTree = "<group>"; };
+		40CACE680DFEFD1100B657E4 /* LexAbaqus.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexAbaqus.cxx; sourceTree = "<group>"; };
+		40CACE690DFEFD1100B657E4 /* LexASY.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexASY.cxx; sourceTree = "<group>"; };
+		40CACE6A0DFEFD1100B657E4 /* LexCmake.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexCmake.cxx; sourceTree = "<group>"; };
+		40CACE6B0DFEFD1100B657E4 /* LexD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexD.cxx; sourceTree = "<group>"; };
+		40CACE6C0DFEFD1100B657E4 /* LexGAP.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexGAP.cxx; sourceTree = "<group>"; };
+		40CACE6D0DFEFD1200B657E4 /* LexPLM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexPLM.cxx; sourceTree = "<group>"; };
+		40CACE6E0DFEFD1200B657E4 /* LexProgress.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexProgress.cxx; sourceTree = "<group>"; };
+		40CACE6F0DFEFD1200B657E4 /* LexR.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LexR.cxx; sourceTree = "<group>"; };
+		40CACE700DFEFD1200B657E4 /* PositionCache.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PositionCache.cxx; sourceTree = "<group>"; };
+		40CACE710DFEFD1200B657E4 /* RunStyles.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunStyles.cxx; sourceTree = "<group>"; };
+		40CACE890DFEFD5500B657E4 /* apptraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = apptraits.cpp; sourceTree = "<group>"; };
+		40CACEA90DFF00E200B657E4 /* evtloopunix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = evtloopunix.cpp; sourceTree = "<group>"; };
 		40CDE8D00982505E00E8156D /* evtloopcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = evtloopcmn.cpp; sourceTree = "<group>"; };
 		40CDE8D9098250AB00E8156D /* evtloop.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = evtloop.cpp; sourceTree = "<group>"; };
 		40D2C99D0BCBA51300973B64 /* btncmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = btncmn.cpp; sourceTree = "<group>"; };
@@ -1867,7 +1912,6 @@
 		CA60176904D43BF100000080 /* init.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = init.cpp; sourceTree = "<group>"; };
 		CA60176C04D43CAA00000080 /* renderg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = renderg.cpp; sourceTree = "<group>"; };
 		CA60176D04D43CAA00000080 /* selstore.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = selstore.cpp; sourceTree = "<group>"; };
-		CA60177204D43D2300000080 /* baseunix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = baseunix.cpp; sourceTree = "<group>"; };
 		CA89578504D7052700000080 /* rendcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = rendcmn.cpp; sourceTree = "<group>"; };
 		CA89578904D705D700000080 /* m_style.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = m_style.cpp; sourceTree = "<group>"; };
 		CA8CC823050E6CD800000080 /* xti.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = xti.cpp; sourceTree = "<group>"; };
@@ -1876,7 +1920,6 @@
 		CA8CC832050EE2BD00000080 /* bookctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = bookctrl.cpp; sourceTree = "<group>"; };
 		CADEF54103C8C0A800000133 /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = display.cpp; sourceTree = "<group>"; };
 		CADEF54303C8C0A800000133 /* MoreFilesX.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = MoreFilesX.c; sourceTree = "<group>"; };
-		CADEF54C03C8C11300000133 /* display.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = display.h; sourceTree = "<group>"; };
 		F55E08F801FDF9CC01000133 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = "<absolute>"; };
 		F58E04FD02F11FA701A8020C /* msgout.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = msgout.cpp; sourceTree = "<group>"; };
 		F5A85C1E01FA022A0175ACA7 /* accel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = accel.h; sourceTree = "<group>"; };
@@ -1913,10 +1956,6 @@
 		F5A85C3D01FA022A0175ACA7 /* dataobj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dataobj.h; sourceTree = "<group>"; };
 		F5A85C3F01FA022A0175ACA7 /* datetime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = datetime.h; sourceTree = "<group>"; };
 		F5A85C4101FA022A0175ACA7 /* datstrm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = datstrm.h; sourceTree = "<group>"; };
-		F5A85C4201FA022A0175ACA7 /* db.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = db.h; sourceTree = "<group>"; };
-		F5A85C4301FA022A0175ACA7 /* dbgrid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dbgrid.h; sourceTree = "<group>"; };
-		F5A85C4401FA022A0175ACA7 /* dbkeyg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dbkeyg.h; sourceTree = "<group>"; };
-		F5A85C4501FA022A0175ACA7 /* dbtable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dbtable.h; sourceTree = "<group>"; };
 		F5A85C4601FA022A0175ACA7 /* dc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dc.h; sourceTree = "<group>"; };
 		F5A85C4701FA022A0175ACA7 /* dcclient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dcclient.h; sourceTree = "<group>"; };
 		F5A85C4801FA022A0175ACA7 /* dcmemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dcmemory.h; sourceTree = "<group>"; };
@@ -1964,7 +2003,6 @@
 		F5A85C7301FA022A0175ACA7 /* gdicmn.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gdicmn.h; sourceTree = "<group>"; };
 		F5A85C7401FA022A0175ACA7 /* gdiobj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gdiobj.h; sourceTree = "<group>"; };
 		F5A85C7701FA022A0175ACA7 /* accel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = accel.h; sourceTree = "<group>"; };
-		F5A85C7801FA022A0175ACA7 /* calctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = calctrl.h; sourceTree = "<group>"; };
 		F5A85C7901FA022A0175ACA7 /* caret.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = caret.h; sourceTree = "<group>"; };
 		F5A85C7A01FA022A0175ACA7 /* choicdgg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = choicdgg.h; sourceTree = "<group>"; };
 		F5A85C7B01FA022A0175ACA7 /* colrdlgg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = colrdlgg.h; sourceTree = "<group>"; };
@@ -2039,8 +2077,6 @@
 		F5A85D2D01FA022B0175ACA7 /* intl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = intl.h; sourceTree = "<group>"; };
 		F5A85D2E01FA022B0175ACA7 /* ioswrap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ioswrap.h; sourceTree = "<group>"; };
 		F5A85D2F01FA022B0175ACA7 /* ipcbase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ipcbase.h; sourceTree = "<group>"; };
-		F5A85D3001FA022B0175ACA7 /* isql.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isql.h; sourceTree = "<group>"; };
-		F5A85D3101FA022B0175ACA7 /* isqlext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = isqlext.h; sourceTree = "<group>"; };
 		F5A85D3201FA022B0175ACA7 /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = joystick.h; sourceTree = "<group>"; };
 		F5A85D3301FA022B0175ACA7 /* layout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = layout.h; sourceTree = "<group>"; };
 		F5A85D3401FA022B0175ACA7 /* laywin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = laywin.h; sourceTree = "<group>"; };
@@ -2050,7 +2086,6 @@
 		F5A85D3901FA022B0175ACA7 /* log.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
 		F5A85D3A01FA022B0175ACA7 /* longlong.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = longlong.h; sourceTree = "<group>"; };
 		F5A85D3C01FA022B0175ACA7 /* accel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = accel.h; sourceTree = "<group>"; };
-		F5A85D3D01FA022B0175ACA7 /* aga.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = aga.h; sourceTree = "<group>"; };
 		F5A85D3E01FA022B0175ACA7 /* app.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = app.h; sourceTree = "<group>"; };
 		F5A85D3F01FA022B0175ACA7 /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = "<group>"; };
 		F5A85D4001FA022B0175ACA7 /* bmpbuttn.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = bmpbuttn.h; sourceTree = "<group>"; };
@@ -2081,16 +2116,12 @@
 		F5A85D5901FA022B0175ACA7 /* fontdlg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = fontdlg.h; sourceTree = "<group>"; };
 		F5A85D5A01FA022B0175ACA7 /* frame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = frame.h; sourceTree = "<group>"; };
 		F5A85D5B01FA022B0175ACA7 /* gauge.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gauge.h; sourceTree = "<group>"; };
-		F5A85D5C01FA022B0175ACA7 /* gdiobj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gdiobj.h; sourceTree = "<group>"; };
 		F5A85D5D01FA022B0175ACA7 /* glcanvas.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = glcanvas.h; sourceTree = "<group>"; };
-		F5A85D5E01FA022B0175ACA7 /* gsockmac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gsockmac.h; sourceTree = "<group>"; };
 		F5A85D6001FA022B0175ACA7 /* icon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = icon.h; sourceTree = "<group>"; };
 		F5A85D6101FA022B0175ACA7 /* imaglist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = imaglist.h; sourceTree = "<group>"; };
 		F5A85D6201FA022B0175ACA7 /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = joystick.h; sourceTree = "<group>"; };
 		F5A85D6301FA022B0175ACA7 /* listbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listbox.h; sourceTree = "<group>"; };
 		F5A85D6401FA022B0175ACA7 /* listctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = listctrl.h; sourceTree = "<group>"; };
-		F5A85D6501FA022B0175ACA7 /* macnotfy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macnotfy.h; sourceTree = "<group>"; };
-		F5A85D6601FA022B0175ACA7 /* macsock.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macsock.h; sourceTree = "<group>"; };
 		F5A85D6701FA022B0175ACA7 /* mdi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = mdi.h; sourceTree = "<group>"; };
 		F5A85D6801FA022B0175ACA7 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = menu.h; sourceTree = "<group>"; };
 		F5A85D6901FA022B0175ACA7 /* menuitem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = menuitem.h; sourceTree = "<group>"; };
@@ -2119,7 +2150,6 @@
 		F5A85D8201FA022B0175ACA7 /* statusbr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = statusbr.h; sourceTree = "<group>"; };
 		F5A85D8301FA022B0175ACA7 /* tabctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tabctrl.h; sourceTree = "<group>"; };
 		F5A85D8501FA022B0175ACA7 /* textctrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = textctrl.h; sourceTree = "<group>"; };
-		F5A85D8601FA022B0175ACA7 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
 		F5A85D8701FA022B0175ACA7 /* toolbar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = toolbar.h; sourceTree = "<group>"; };
 		F5A85D8801FA022B0175ACA7 /* tooltip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tooltip.h; sourceTree = "<group>"; };
 		F5A85D8901FA022B0175ACA7 /* toplevel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = toplevel.h; sourceTree = "<group>"; };
@@ -2220,7 +2250,6 @@
 		F5A85F7E01FA022B0175ACA7 /* variant.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = variant.h; sourceTree = "<group>"; };
 		F5A85F7F01FA022B0175ACA7 /* vector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vector.h; sourceTree = "<group>"; };
 		F5A85F8001FA022B0175ACA7 /* version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
-		F5A85F8201FA022B0175ACA7 /* wave.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; };
 		F5A85F8301FA022B0175ACA7 /* wfstream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wfstream.h; sourceTree = "<group>"; };
 		F5A85F8401FA022B0175ACA7 /* window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
 		F5A85F8501FA022B0175ACA7 /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wizard.h; sourceTree = "<group>"; };
@@ -2347,7 +2376,6 @@
 		F5A8606801FA022C0175ACA7 /* zipstrm.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zipstrm.cpp; sourceTree = "<group>"; };
 		F5A8606901FA022C0175ACA7 /* zstream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zstream.cpp; sourceTree = "<group>"; };
 		F5A8607001FA022C0175ACA7 /* busyinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = busyinfo.cpp; sourceTree = "<group>"; };
-		F5A8607101FA022C0175ACA7 /* calctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = calctrl.cpp; sourceTree = "<group>"; };
 		F5A8607201FA022C0175ACA7 /* caret.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = caret.cpp; sourceTree = "<group>"; };
 		F5A8607301FA022C0175ACA7 /* choicdgg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = choicdgg.cpp; sourceTree = "<group>"; };
 		F5A8607401FA022C0175ACA7 /* colrdlgg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = colrdlgg.cpp; sourceTree = "<group>"; };
@@ -2459,9 +2487,7 @@
 		F5A861A901FA022C0175ACA7 /* colour.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = colour.cpp; sourceTree = "<group>"; };
 		F5A861AB01FA022C0175ACA7 /* control.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = control.cpp; sourceTree = "<group>"; };
 		F5A861AD01FA022C0175ACA7 /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
-		F5A861AE01FA022C0175ACA7 /* data.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data.cpp; sourceTree = "<group>"; };
 		F5A861AF01FA022C0175ACA7 /* dataobj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dataobj.cpp; sourceTree = "<group>"; };
-		F5A861B001FA022C0175ACA7 /* dc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dc.cpp; sourceTree = "<group>"; };
 		F5A861B101FA022C0175ACA7 /* dcclient.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dcclient.cpp; sourceTree = "<group>"; };
 		F5A861B201FA022C0175ACA7 /* dcmemory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dcmemory.cpp; sourceTree = "<group>"; };
 		F5A861B301FA022C0175ACA7 /* dcprint.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dcprint.cpp; sourceTree = "<group>"; };
@@ -2480,7 +2506,6 @@
 		F5A861C101FA022C0175ACA7 /* taskbar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = taskbar.cpp; sourceTree = "<group>"; };
 		F5A861C501FA022C0175ACA7 /* icon.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = icon.cpp; sourceTree = "<group>"; };
 		F5A861C701FA022C0175ACA7 /* listbox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = listbox.cpp; sourceTree = "<group>"; };
-		F5A861C801FA022C0175ACA7 /* macnotfy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = macnotfy.cpp; sourceTree = "<group>"; };
 		F5A861CC01FA022C0175ACA7 /* mdi.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mdi.cpp; sourceTree = "<group>"; };
 		F5A861CD01FA022C0175ACA7 /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cpp; sourceTree = "<group>"; };
 		F5A861CE01FA022C0175ACA7 /* menuitem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = menuitem.cpp; sourceTree = "<group>"; };
@@ -2522,7 +2547,6 @@
 		F5A8620401FA022C0175ACA7 /* toplevel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = toplevel.cpp; sourceTree = "<group>"; };
 		F5A8620601FA022C0175ACA7 /* uma.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = uma.cpp; sourceTree = "<group>"; };
 		F5A8620701FA022C0175ACA7 /* utils.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = utils.cpp; sourceTree = "<group>"; };
-		F5A8620801FA022C0175ACA7 /* utilsexc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = utilsexc.cpp; sourceTree = "<group>"; };
 		F5A8620A01FA022C0175ACA7 /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = window.cpp; sourceTree = "<group>"; };
 		F5A863BF01FA022D0175ACA7 /* png.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = png.c; sourceTree = "<group>"; };
 		F5A863C401FA022D0175ACA7 /* pngerror.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pngerror.c; sourceTree = "<group>"; };
@@ -2666,6 +2690,17 @@
 		40329E150CCBD1AB0013BF89 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				40CACE670DFEFD1100B657E4 /* Decoration.cxx */,
+				40CACE680DFEFD1100B657E4 /* LexAbaqus.cxx */,
+				40CACE690DFEFD1100B657E4 /* LexASY.cxx */,
+				40CACE6A0DFEFD1100B657E4 /* LexCmake.cxx */,
+				40CACE6B0DFEFD1100B657E4 /* LexD.cxx */,
+				40CACE6C0DFEFD1100B657E4 /* LexGAP.cxx */,
+				40CACE6D0DFEFD1200B657E4 /* LexPLM.cxx */,
+				40CACE6E0DFEFD1200B657E4 /* LexProgress.cxx */,
+				40CACE6F0DFEFD1200B657E4 /* LexR.cxx */,
+				40CACE700DFEFD1200B657E4 /* PositionCache.cxx */,
+				40CACE710DFEFD1200B657E4 /* RunStyles.cxx */,
 				40329E160CCBD1AB0013BF89 /* AutoComplete.cxx */,
 				40329E170CCBD1AB0013BF89 /* AutoComplete.h */,
 				40329E180CCBD1AB0013BF89 /* CallTip.cxx */,
@@ -2771,7 +2806,7 @@
 			path = src;
 			sourceTree = "<group>";
 		};
-		40670A8107377A3600F7C08C /* mac/corefoundation */ = {
+		40670A8107377A3600F7C08C /* osx/core */ = {
 			isa = PBXGroup;
 			children = (
 				40C3B31F0CCBF20900DE0E06 /* strconv_cf.cpp */,
@@ -2783,8 +2818,8 @@
 				40011CBB0893D5B400E4DE95 /* utilsexc_base.cpp */,
 				40607C750749432A00DC0420 /* utilsexc_cf.cpp */,
 			);
-			name = mac/corefoundation;
-			path = mac/carbon;
+			name = osx/core;
+			path = osx/carbon;
 			sourceTree = "<group>";
 		};
 		407C6AD60A899E260056252A /* aui */ = {
@@ -2918,7 +2953,7 @@
 				CADEF54303C8C0A800000133 /* MoreFilesX.c */,
 			);
 			name = morefilex;
-			path = mac/carbon/morefilex;
+			path = osx/carbon/morefilex;
 			sourceTree = SOURCE_ROOT;
 		};
 		F5A85C1A01FA022A0175ACA7 /* include */ = {
@@ -2971,10 +3006,6 @@
 				F5A85C3D01FA022A0175ACA7 /* dataobj.h */,
 				F5A85C3F01FA022A0175ACA7 /* datetime.h */,
 				F5A85C4101FA022A0175ACA7 /* datstrm.h */,
-				F5A85C4201FA022A0175ACA7 /* db.h */,
-				F5A85C4301FA022A0175ACA7 /* dbgrid.h */,
-				F5A85C4401FA022A0175ACA7 /* dbkeyg.h */,
-				F5A85C4501FA022A0175ACA7 /* dbtable.h */,
 				F5A85C4601FA022A0175ACA7 /* dc.h */,
 				F5A85C4701FA022A0175ACA7 /* dcclient.h */,
 				F5A85C4801FA022A0175ACA7 /* dcmemory.h */,
@@ -3048,8 +3079,6 @@
 				F5A85D2D01FA022B0175ACA7 /* intl.h */,
 				F5A85D2E01FA022B0175ACA7 /* ioswrap.h */,
 				F5A85D2F01FA022B0175ACA7 /* ipcbase.h */,
-				F5A85D3001FA022B0175ACA7 /* isql.h */,
-				F5A85D3101FA022B0175ACA7 /* isqlext.h */,
 				F5A85D3201FA022B0175ACA7 /* joystick.h */,
 				F5A85D3301FA022B0175ACA7 /* layout.h */,
 				F5A85D3401FA022B0175ACA7 /* laywin.h */,
@@ -3059,7 +3088,7 @@
 				F5A8703A01FA0B7F0175ACA7 /* listimpl.cpp */,
 				F5A85D3901FA022B0175ACA7 /* log.h */,
 				F5A85D3A01FA022B0175ACA7 /* longlong.h */,
-				F5A85D3B01FA022B0175ACA7 /* mac/carbon */,
+				F5A85D3B01FA022B0175ACA7 /* osx/carbon */,
 				F5A85D8E01FA022B0175ACA7 /* matrix.h */,
 				F5A85D8F01FA022B0175ACA7 /* mdi.h */,
 				F5A85D9001FA022B0175ACA7 /* memconf.h */,
@@ -3151,7 +3180,6 @@
 				F5A85F7F01FA022B0175ACA7 /* vector.h */,
 				F5A85F8001FA022B0175ACA7 /* version.h */,
 				F5CC83E90379C20901000133 /* volume.h */,
-				F5A85F8201FA022B0175ACA7 /* wave.h */,
 				F5A85F8301FA022B0175ACA7 /* wfstream.h */,
 				F5A85F8401FA022B0175ACA7 /* window.h */,
 				F5A85F8501FA022B0175ACA7 /* wizard.h */,
@@ -3171,7 +3199,6 @@
 			isa = PBXGroup;
 			children = (
 				F5A85C7701FA022A0175ACA7 /* accel.h */,
-				F5A85C7801FA022A0175ACA7 /* calctrl.h */,
 				F5A85C7901FA022A0175ACA7 /* caret.h */,
 				F5A85C7A01FA022A0175ACA7 /* choicdgg.h */,
 				F5A85C7B01FA022A0175ACA7 /* colrdlgg.h */,
@@ -3234,12 +3261,11 @@
 			path = html;
 			sourceTree = "<group>";
 		};
-		F5A85D3B01FA022B0175ACA7 /* mac/carbon */ = {
+		F5A85D3B01FA022B0175ACA7 /* osx/carbon */ = {
 			isa = PBXGroup;
 			children = (
 				61048A6D0B277DC2009C253D /* private */,
 				F5A85D3C01FA022B0175ACA7 /* accel.h */,
-				F5A85D3D01FA022B0175ACA7 /* aga.h */,
 				F5A85D3E01FA022B0175ACA7 /* app.h */,
 				F5A85D3F01FA022B0175ACA7 /* bitmap.h */,
 				F5A85D4001FA022B0175ACA7 /* bmpbuttn.h */,
@@ -3264,23 +3290,18 @@
 				F5A85D5301FA022B0175ACA7 /* dcscreen.h */,
 				F5A85D5401FA022B0175ACA7 /* dialog.h */,
 				F5A85D5501FA022B0175ACA7 /* dirdlg.h */,
-				CADEF54C03C8C11300000133 /* display.h */,
 				F5A85D5601FA022B0175ACA7 /* dnd.h */,
 				F5A85D5701FA022B0175ACA7 /* filedlg.h */,
 				F5A85D5801FA022B0175ACA7 /* font.h */,
 				F5A85D5901FA022B0175ACA7 /* fontdlg.h */,
 				F5A85D5A01FA022B0175ACA7 /* frame.h */,
 				F5A85D5B01FA022B0175ACA7 /* gauge.h */,
-				F5A85D5C01FA022B0175ACA7 /* gdiobj.h */,
 				F5A85D5D01FA022B0175ACA7 /* glcanvas.h */,
-				F5A85D5E01FA022B0175ACA7 /* gsockmac.h */,
 				F5A85D6001FA022B0175ACA7 /* icon.h */,
 				F5A85D6101FA022B0175ACA7 /* imaglist.h */,
 				F5A85D6201FA022B0175ACA7 /* joystick.h */,
 				F5A85D6301FA022B0175ACA7 /* listbox.h */,
 				F5A85D6401FA022B0175ACA7 /* listctrl.h */,
-				F5A85D6501FA022B0175ACA7 /* macnotfy.h */,
-				F5A85D6601FA022B0175ACA7 /* macsock.h */,
 				F5A85D6701FA022B0175ACA7 /* mdi.h */,
 				F5A85D6801FA022B0175ACA7 /* menu.h */,
 				F5A85D6901FA022B0175ACA7 /* menuitem.h */,
@@ -3309,7 +3330,6 @@
 				F5A85D8201FA022B0175ACA7 /* statusbr.h */,
 				F5A85D8301FA022B0175ACA7 /* tabctrl.h */,
 				F5A85D8501FA022B0175ACA7 /* textctrl.h */,
-				F5A85D8601FA022B0175ACA7 /* timer.h */,
 				F5A85D8701FA022B0175ACA7 /* toolbar.h */,
 				F5A85D8801FA022B0175ACA7 /* tooltip.h */,
 				F5A85D8901FA022B0175ACA7 /* toplevel.h */,
@@ -3317,7 +3337,7 @@
 				F5A85D8B01FA022B0175ACA7 /* uma.h */,
 				F5A85D8D01FA022B0175ACA7 /* window.h */,
 			);
-			path = mac/carbon;
+			path = osx/carbon;
 			sourceTree = "<group>";
 		};
 		F5A85F0E01FA022B0175ACA7 /* protocol */ = {
@@ -3350,8 +3370,8 @@
 				F5A8606E01FA022C0175ACA7 /* generic */,
 				F5A860F101FA022C0175ACA7 /* html */,
 				F5A8613E01FA022C0175ACA7 /* jpeg */,
-				40670A8107377A3600F7C08C /* mac/corefoundation */,
-				F5A8619901FA022C0175ACA7 /* mac/carbon */,
+				40670A8107377A3600F7C08C /* osx/core */,
+				F5A8619901FA022C0175ACA7 /* osx/carbon */,
 				F5A863AB01FA022C0175ACA7 /* png */,
 				4086C62E063AAD4A00D4CD53 /* regex */,
 				40F185B80AB722BC00E3BEF9 /* richtext */,
@@ -3367,6 +3387,10 @@
 		F5A85FDD01FA022B0175ACA7 /* common */ = {
 			isa = PBXGroup;
 			children = (
+				40CACE590DFEF9B900B657E4 /* bmpcboxcmn.cpp */,
+				40CACE5A0DFEF9B900B657E4 /* calctrlcmn.cpp */,
+				40CACE5B0DFEF9B900B657E4 /* windowid.cpp */,
+				40CACE5C0DFEF9B900B657E4 /* wrapsizer.cpp */,
 				40D33A260CCC7A2A000852B8 /* fdiodispatcher.cpp */,
 				40D33A270CCC7A2A000852B8 /* filectrlcmn.cpp */,
 				40AA0F920CCBE7D5002A2ED8 /* textentrycmn.cpp */,
@@ -3567,6 +3591,7 @@
 		F5A8606E01FA022C0175ACA7 /* generic */ = {
 			isa = PBXGroup;
 			children = (
+				40CACE540DFEF97F00B657E4 /* calctrlg.cpp */,
 				40D33A1E0CCC79FF000852B8 /* filectrlg.cpp */,
 				40D2CAD70BCBC64600973B64 /* hyperlinkg.cpp */,
 				404DAEEA0ADD143200687775 /* aboutdlgg.cpp */,
@@ -3574,7 +3599,6 @@
 				4067EFC40ACD53B1004A2D14 /* bmpcboxg.cpp */,
 				408A59820A8998A40014D20E /* buttonbar.cpp */,
 				F5A8607001FA022C0175ACA7 /* busyinfo.cpp */,
-				F5A8607101FA022C0175ACA7 /* calctrl.cpp */,
 				F5A8607201FA022C0175ACA7 /* caret.cpp */,
 				40ADC47208160C200009DA36 /* choicbkg.cpp */,
 				F5A8607301FA022C0175ACA7 /* choicdgg.cpp */,
@@ -3716,9 +3740,11 @@
 			path = jpeg;
 			sourceTree = "<group>";
 		};
-		F5A8619901FA022C0175ACA7 /* mac/carbon */ = {
+		F5A8619901FA022C0175ACA7 /* osx/carbon */ = {
 			isa = PBXGroup;
 			children = (
+				40CACE490DFEF94C00B657E4 /* nonownedwnd.cpp */,
+				40CACE4A0DFEF94C00B657E4 /* popupwin.cpp */,
 				40D2C9A20BCBA64400973B64 /* artmac.cpp */,
 				404DAED30ADD137500687775 /* aboutdlg.cpp */,
 				F5A8619A01FA022C0175ACA7 /* accel.cpp */,
@@ -3737,12 +3763,9 @@
 				40AF913507C8BD1F006A6D3C /* combobox.cpp */,
 				F5A861AB01FA022C0175ACA7 /* control.cpp */,
 				F5A861AD01FA022C0175ACA7 /* cursor.cpp */,
-				F5A861AE01FA022C0175ACA7 /* data.cpp */,
 				40AA0F7D0CCBE720002A2ED8 /* databrow.cpp */,
 				F5A861AF01FA022C0175ACA7 /* dataobj.cpp */,
 				40AA0F7E0CCBE720002A2ED8 /* dataview.cpp */,
-				F5A861B001FA022C0175ACA7 /* dc.cpp */,
-				40AF90E407C8B18C006A6D3C /* dccg.cpp */,
 				F5A861B101FA022C0175ACA7 /* dcclient.cpp */,
 				F5A861B201FA022C0175ACA7 /* dcmemory.cpp */,
 				F5A861B301FA022C0175ACA7 /* dcprint.cpp */,
@@ -3769,7 +3792,6 @@
 				401640E507F94B2800A8837A /* imaglist.cpp */,
 				F5A861C701FA022C0175ACA7 /* listbox.cpp */,
 				403F73940AC9985500FF2BCB /* listctrl_mac.cpp */,
-				F5A861C801FA022C0175ACA7 /* macnotfy.cpp */,
 				40AF90E807C8B18C006A6D3C /* mediactrl.cpp */,
 				F5A861CC01FA022C0175ACA7 /* mdi.cpp */,
 				F5A861CD01FA022C0175ACA7 /* menu.cpp */,
@@ -3814,10 +3836,9 @@
 				F5A8620601FA022C0175ACA7 /* uma.cpp */,
 				F5A8620701FA022C0175ACA7 /* utils.cpp */,
 				400226610CE644C0007F534D /* utilscocoa.mm */,
-				F5A8620801FA022C0175ACA7 /* utilsexc.cpp */,
 				F5A8620A01FA022C0175ACA7 /* window.cpp */,
 			);
-			path = mac/carbon;
+			path = osx/carbon;
 			sourceTree = "<group>";
 		};
 		F5A861D201FA022C0175ACA7 /* morefile */ = {
@@ -3918,9 +3939,10 @@
 		F5A8648A01FA022D0175ACA7 /* unix */ = {
 			isa = PBXGroup;
 			children = (
+				40CACEA90DFF00E200B657E4 /* evtloopunix.cpp */,
+				40CACE890DFEFD5500B657E4 /* apptraits.cpp */,
 				40C3B3480CCBF43E00DE0E06 /* appunix.cpp */,
 				40C3B33F0CCBF3CB00DE0E06 /* timerunx.cpp */,
-				CA60177204D43D2300000080 /* baseunix.cpp */,
 				40AF90BD07C8AA08006A6D3C /* dlunix.cpp */,
 				40DCE34F06C744C90000D83E /* gsocket.cpp */,
 				F5A8649201FA022D0175ACA7 /* snglinst.cpp */,
@@ -4268,7 +4290,6 @@
 				4086C7BC063AB2FF00D4CD53 /* wincmn.cpp in Sources */,
 				4086C7BD063AB2FF00D4CD53 /* zstream.cpp in Sources */,
 				4086C7BE063AB2FF00D4CD53 /* busyinfo.cpp in Sources */,
-				4086C7BF063AB2FF00D4CD53 /* calctrl.cpp in Sources */,
 				4086C7C0063AB2FF00D4CD53 /* caret.cpp in Sources */,
 				4086C7C1063AB2FF00D4CD53 /* choicdgg.cpp in Sources */,
 				4086C7C2063AB2FF00D4CD53 /* grid.cpp in Sources */,
@@ -4380,9 +4401,7 @@
 				4086C831063AB2FF00D4CD53 /* control.cpp in Sources */,
 				4086C832063AB2FF00D4CD53 /* choice.cpp in Sources */,
 				4086C833063AB2FF00D4CD53 /* cursor.cpp in Sources */,
-				4086C834063AB2FF00D4CD53 /* data.cpp in Sources */,
 				4086C835063AB2FF00D4CD53 /* dataobj.cpp in Sources */,
-				4086C836063AB2FF00D4CD53 /* dc.cpp in Sources */,
 				4086C837063AB2FF00D4CD53 /* minifram.cpp in Sources */,
 				4086C838063AB2FF00D4CD53 /* mimetmac.cpp in Sources */,
 				4086C839063AB2FF00D4CD53 /* metafile.cpp in Sources */,
@@ -4410,7 +4429,6 @@
 				4086C850063AB2FF00D4CD53 /* timer.cpp in Sources */,
 				4086C851063AB2FF00D4CD53 /* tooltip.cpp in Sources */,
 				4086C852063AB2FF00D4CD53 /* window.cpp in Sources */,
-				4086C853063AB2FF00D4CD53 /* utilsexc.cpp in Sources */,
 				4086C854063AB2FF00D4CD53 /* utils.cpp in Sources */,
 				4086C855063AB2FF00D4CD53 /* uma.cpp in Sources */,
 				4086C856063AB2FF00D4CD53 /* toplevel.cpp in Sources */,
@@ -4432,7 +4450,6 @@
 				4086C867063AB2FF00D4CD53 /* menuitem.cpp in Sources */,
 				4086C868063AB2FF00D4CD53 /* menu.cpp in Sources */,
 				4086C869063AB2FF00D4CD53 /* mdi.cpp in Sources */,
-				4086C86A063AB2FF00D4CD53 /* macnotfy.cpp in Sources */,
 				4086C86B063AB2FF00D4CD53 /* listbox.cpp in Sources */,
 				4086C86D063AB2FF00D4CD53 /* icon.cpp in Sources */,
 				4086C86E063AB2FF00D4CD53 /* taskbar.cpp in Sources */,
@@ -4475,7 +4492,6 @@
 				4086C8B5063AB2FF00D4CD53 /* init.cpp in Sources */,
 				4086C8B6063AB2FF00D4CD53 /* renderg.cpp in Sources */,
 				4086C8B7063AB2FF00D4CD53 /* selstore.cpp in Sources */,
-				4086C8B8063AB2FF00D4CD53 /* baseunix.cpp in Sources */,
 				4086C8B9063AB2FF00D4CD53 /* rendcmn.cpp in Sources */,
 				4086C8BA063AB2FF00D4CD53 /* m_style.cpp in Sources */,
 				4086C8BB063AB2FF00D4CD53 /* xti.cpp in Sources */,
@@ -4516,7 +4532,6 @@
 				40AF90BE07C8AA08006A6D3C /* dlunix.cpp in Sources */,
 				40AF90C307C8AA17006A6D3C /* chm.cpp in Sources */,
 				40AF90E907C8B18C006A6D3C /* colordlgosx.mm in Sources */,
-				40AF90EB07C8B18C006A6D3C /* dccg.cpp in Sources */,
 				40AF90EC07C8B18C006A6D3C /* drawer.cpp in Sources */,
 				40AF90ED07C8B18C006A6D3C /* fontdlgosx.mm in Sources */,
 				40AF90EF07C8B18C006A6D3C /* mediactrl.cpp in Sources */,
@@ -4806,6 +4821,26 @@
 				40D33A320CCC7A60000852B8 /* xh_propdlg.cpp in Sources */,
 				40D33A330CCC7A60000852B8 /* xh_srchctrl.cpp in Sources */,
 				400226620CE644C0007F534D /* utilscocoa.mm in Sources */,
+				40CACE4B0DFEF94C00B657E4 /* nonownedwnd.cpp in Sources */,
+				40CACE4C0DFEF94C00B657E4 /* popupwin.cpp in Sources */,
+				40CACE550DFEF97F00B657E4 /* calctrlg.cpp in Sources */,
+				40CACE5D0DFEF9B900B657E4 /* bmpcboxcmn.cpp in Sources */,
+				40CACE5E0DFEF9B900B657E4 /* calctrlcmn.cpp in Sources */,
+				40CACE5F0DFEF9B900B657E4 /* windowid.cpp in Sources */,
+				40CACE600DFEF9B900B657E4 /* wrapsizer.cpp in Sources */,
+				40CACE720DFEFD1200B657E4 /* Decoration.cxx in Sources */,
+				40CACE730DFEFD1200B657E4 /* LexAbaqus.cxx in Sources */,
+				40CACE740DFEFD1200B657E4 /* LexASY.cxx in Sources */,
+				40CACE750DFEFD1200B657E4 /* LexCmake.cxx in Sources */,
+				40CACE760DFEFD1200B657E4 /* LexD.cxx in Sources */,
+				40CACE770DFEFD1200B657E4 /* LexGAP.cxx in Sources */,
+				40CACE780DFEFD1200B657E4 /* LexPLM.cxx in Sources */,
+				40CACE790DFEFD1200B657E4 /* LexProgress.cxx in Sources */,
+				40CACE7A0DFEFD1200B657E4 /* LexR.cxx in Sources */,
+				40CACE7B0DFEFD1200B657E4 /* PositionCache.cxx in Sources */,
+				40CACE7C0DFEFD1200B657E4 /* RunStyles.cxx in Sources */,
+				40CACE8A0DFEFD5500B657E4 /* apptraits.cpp in Sources */,
+				40CACEAA0DFF00E200B657E4 /* evtloopunix.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4928,7 +4963,6 @@
 				4086CACF063AB30000D4CD53 /* wincmn.cpp in Sources */,
 				4086CAD0063AB30000D4CD53 /* zstream.cpp in Sources */,
 				4086CAD1063AB30000D4CD53 /* busyinfo.cpp in Sources */,
-				4086CAD2063AB30000D4CD53 /* calctrl.cpp in Sources */,
 				4086CAD3063AB30000D4CD53 /* caret.cpp in Sources */,
 				4086CAD4063AB30000D4CD53 /* choicdgg.cpp in Sources */,
 				4086CAD5063AB30000D4CD53 /* grid.cpp in Sources */,
@@ -5040,9 +5074,7 @@
 				4086CB44063AB30000D4CD53 /* control.cpp in Sources */,
 				4086CB45063AB30000D4CD53 /* choice.cpp in Sources */,
 				4086CB46063AB30000D4CD53 /* cursor.cpp in Sources */,
-				4086CB47063AB30000D4CD53 /* data.cpp in Sources */,
 				4086CB48063AB30000D4CD53 /* dataobj.cpp in Sources */,
-				4086CB49063AB30000D4CD53 /* dc.cpp in Sources */,
 				4086CB4A063AB30000D4CD53 /* minifram.cpp in Sources */,
 				4086CB4B063AB30000D4CD53 /* mimetmac.cpp in Sources */,
 				4086CB4C063AB30000D4CD53 /* metafile.cpp in Sources */,
@@ -5070,7 +5102,6 @@
 				4086CB63063AB30000D4CD53 /* timer.cpp in Sources */,
 				4086CB64063AB30000D4CD53 /* tooltip.cpp in Sources */,
 				4086CB65063AB30000D4CD53 /* window.cpp in Sources */,
-				4086CB66063AB30000D4CD53 /* utilsexc.cpp in Sources */,
 				4086CB67063AB30000D4CD53 /* utils.cpp in Sources */,
 				4086CB68063AB30000D4CD53 /* uma.cpp in Sources */,
 				4086CB69063AB30000D4CD53 /* toplevel.cpp in Sources */,
@@ -5092,7 +5123,6 @@
 				4086CB7A063AB30000D4CD53 /* menuitem.cpp in Sources */,
 				4086CB7B063AB30000D4CD53 /* menu.cpp in Sources */,
 				4086CB7C063AB30000D4CD53 /* mdi.cpp in Sources */,
-				4086CB7D063AB30000D4CD53 /* macnotfy.cpp in Sources */,
 				4086CB7E063AB30000D4CD53 /* listbox.cpp in Sources */,
 				4086CB80063AB30000D4CD53 /* icon.cpp in Sources */,
 				4086CB81063AB30000D4CD53 /* taskbar.cpp in Sources */,
@@ -5127,7 +5157,6 @@
 				4086CBBF063AB30000D4CD53 /* datacmn.cpp in Sources */,
 				4086CBC0063AB30000D4CD53 /* dpycmn.cpp in Sources */,
 				4086CBC1063AB30000D4CD53 /* rgncmn.cpp in Sources */,
-				4086CBC2063AB30000D4CD53 /* appbase.cpp in Sources */,
 				4086CBC4063AB30000D4CD53 /* fldlgcmn.cpp in Sources */,
 				4086CBC5063AB30000D4CD53 /* fmapbase.cpp in Sources */,
 				4086CBC6063AB30000D4CD53 /* stopwatch.cpp in Sources */,
@@ -5135,7 +5164,6 @@
 				4086CBC8063AB30000D4CD53 /* init.cpp in Sources */,
 				4086CBC9063AB30000D4CD53 /* renderg.cpp in Sources */,
 				4086CBCA063AB30000D4CD53 /* selstore.cpp in Sources */,
-				4086CBCB063AB30000D4CD53 /* baseunix.cpp in Sources */,
 				4086CBCC063AB30000D4CD53 /* rendcmn.cpp in Sources */,
 				4086CBCD063AB30000D4CD53 /* m_style.cpp in Sources */,
 				4086CBCE063AB30000D4CD53 /* xti.cpp in Sources */,
@@ -5176,7 +5204,6 @@
 				40AF90C007C8AA08006A6D3C /* dlunix.cpp in Sources */,
 				40AF90C507C8AA17006A6D3C /* chm.cpp in Sources */,
 				40AF90F707C8B18C006A6D3C /* colordlgosx.mm in Sources */,
-				40AF90F907C8B18C006A6D3C /* dccg.cpp in Sources */,
 				40AF90FA07C8B18C006A6D3C /* drawer.cpp in Sources */,
 				40AF90FB07C8B18C006A6D3C /* fontdlgosx.mm in Sources */,
 				40AF90FD07C8B18C006A6D3C /* mediactrl.cpp in Sources */,
@@ -5466,6 +5493,27 @@
 				40D33A340CCC7A60000852B8 /* xh_propdlg.cpp in Sources */,
 				40D33A350CCC7A60000852B8 /* xh_srchctrl.cpp in Sources */,
 				400226630CE644C0007F534D /* utilscocoa.mm in Sources */,
+				40CACE4D0DFEF94C00B657E4 /* nonownedwnd.cpp in Sources */,
+				40CACE4E0DFEF94C00B657E4 /* popupwin.cpp in Sources */,
+				40CACE560DFEF97F00B657E4 /* calctrlg.cpp in Sources */,
+				40CACE610DFEF9B900B657E4 /* bmpcboxcmn.cpp in Sources */,
+				40CACE620DFEF9B900B657E4 /* calctrlcmn.cpp in Sources */,
+				40CACE630DFEF9B900B657E4 /* windowid.cpp in Sources */,
+				40CACE640DFEF9B900B657E4 /* wrapsizer.cpp in Sources */,
+				40CACE7D0DFEFD1200B657E4 /* Decoration.cxx in Sources */,
+				40CACE7E0DFEFD1200B657E4 /* LexAbaqus.cxx in Sources */,
+				40CACE7F0DFEFD1200B657E4 /* LexASY.cxx in Sources */,
+				40CACE800DFEFD1200B657E4 /* LexCmake.cxx in Sources */,
+				40CACE810DFEFD1200B657E4 /* LexD.cxx in Sources */,
+				40CACE820DFEFD1200B657E4 /* LexGAP.cxx in Sources */,
+				40CACE830DFEFD1200B657E4 /* LexPLM.cxx in Sources */,
+				40CACE840DFEFD1200B657E4 /* LexProgress.cxx in Sources */,
+				40CACE850DFEFD1200B657E4 /* LexR.cxx in Sources */,
+				40CACE860DFEFD1200B657E4 /* PositionCache.cxx in Sources */,
+				40CACE870DFEFD1200B657E4 /* RunStyles.cxx in Sources */,
+				40CACE8B0DFEFD5500B657E4 /* apptraits.cpp in Sources */,
+				40CACE9D0DFEFF3200B657E4 /* appbase.cpp in Sources */,
+				40CACEAB0DFF00E200B657E4 /* evtloopunix.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5516,7 +5564,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = NO;
 				HEADER_SEARCH_PATHS = tiff/libtiff;
 				PRODUCT_NAME = "$(PRODUCT_NAME)_static";
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
+				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include osx/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
 				USE_HEADERMAP = NO;
 				USE_SEPARATE_HEADERMAPS = YES;
 				WARNING_CFLAGS = (
@@ -5557,7 +5605,7 @@
 				HEADER_SEARCH_PATHS = tiff/libtiff;
 				PRODUCT_NAME = "$(PRODUCT_NAME)_static";
 				UNSTRIPPED_PRODUCT = NO;
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
+				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include osx/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
 				USE_HEADERMAP = NO;
 				USE_SEPARATE_HEADERMAPS = YES;
 				WARNING_CFLAGS = (
@@ -5611,7 +5659,7 @@
 				OTHER_LIBTOOL_FLAGS = "$(value) ";
 				OTHER_REZFLAGS = "-d __UNIX__";
 				REZ_EXECUTABLE = NO;
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
+				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include osx/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
 				USE_HEADERMAP = FALSE;
 				USE_SEPARATE_HEADERMAPS = YES;
 				WARNING_CFLAGS = (
@@ -5658,7 +5706,7 @@
 				);
 				OTHER_REZFLAGS = "-d __UNIX__";
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
+				USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include osx/carbon/morefilex common jpeg png regex expat/lib tiff/libtiff stc stc/scintilla/include stc/scintilla/src";
 				USE_HEADERMAP = FALSE;
 				WARNING_CFLAGS = (
 					"-Wmost",