X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78577dcb71a8d748b9f5708321c3956c8b83bbe1..34ea3c74912db9d9142c1af0342f911f748e128d:/src/wxWindows.xcode/project.pbxproj

diff --git a/src/wxWindows.xcode/project.pbxproj b/src/wxWindows.xcode/project.pbxproj
index 60e5b6be2f..1a4bf4b334 100644
--- a/src/wxWindows.xcode/project.pbxproj
+++ b/src/wxWindows.xcode/project.pbxproj
@@ -61,6 +61,7 @@
 		};
 		0867D69AFE84028FC02AAC07 = {
 			children = (
+				0A98CD2207172992007B4289,
 				08FB77AAFE841565C02AAC07,
 				F5C5D3DF01FA2D0A01D0F0BA,
 				F55E08F801FDF9CC01000133,
@@ -73,8 +74,7 @@
 			sourceTree = "<group>";
 		};
 		08FB77AAFE841565C02AAC07 = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = Carbon.framework;
 			path = /System/Library/Frameworks/Carbon.framework;
@@ -86,6 +86,168 @@
 //082
 //083
 //084
+//0A0
+//0A1
+//0A2
+//0A3
+//0A4
+		0A98CB550714687E007B4289 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = hid.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		0A98CB560714687E007B4289 = {
+			fileRef = 0A98CB550714687E007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB570714687E007B4289 = {
+			fileRef = 0A98CB550714687E007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB580714687E007B4289 = {
+			fileRef = 0A98CB550714687E007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB590714687E007B4289 = {
+			fileRef = 0A98CB550714687E007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB6A07146A06007B4289 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = statbar.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		0A98CB6B07146A06007B4289 = {
+			fileRef = 0A98CB6A07146A06007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB6C07146A06007B4289 = {
+			fileRef = 0A98CB6A07146A06007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB6D07146A06007B4289 = {
+			fileRef = 0A98CB6A07146A06007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CB6E07146A06007B4289 = {
+			fileRef = 0A98CB6A07146A06007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC470715CFBC007B4289 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = gdiobj.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		0A98CC480715CFBC007B4289 = {
+			fileRef = 0A98CC470715CFBC007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC490715CFBC007B4289 = {
+			fileRef = 0A98CC470715CFBC007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4A0715CFBC007B4289 = {
+			fileRef = 0A98CC470715CFBC007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4B0715CFBC007B4289 = {
+			fileRef = 0A98CC470715CFBC007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4C0715D03E007B4289 = {
+			fileRef = CA0CB57F0450773900000102;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4D0715D045007B4289 = {
+			fileRef = CA0CB57F0450773900000102;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4E0715D04C007B4289 = {
+			fileRef = CA0CB57F0450773900000102;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CC4F0715D053007B4289 = {
+			fileRef = CA0CB57F0450773900000102;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CD2207172992007B4289 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = QuickTime.framework;
+			path = /System/Library/Frameworks/QuickTime.framework;
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		0A98CD2307172992007B4289 = {
+			fileRef = 0A98CD2207172992007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CD2407172992007B4289 = {
+			fileRef = 0A98CD2207172992007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CD2507172992007B4289 = {
+			fileRef = 0A98CD2207172992007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		0A98CD2607172992007B4289 = {
+			fileRef = 0A98CD2207172992007B4289;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//0A0
+//0A1
+//0A2
+//0A3
+//0A4
 //400
 //401
 //402
@@ -111,43 +273,356 @@
 			settings = {
 			};
 		};
-		4086C3A2063A454900D4CD53 = {
+		40607C1407493C3F00DC0420 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			path = sound.cpp;
+			path = archive.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		4086C58C063AA59200D4CD53 = {
+		40607C1607493C3F00DC0420 = {
+			fileRef = 40607C1407493C3F00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C1807493C3F00DC0420 = {
+			fileRef = 40607C1407493C3F00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C1A07493C3F00DC0420 = {
+			fileRef = 40607C1407493C3F00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C1C07493C3F00DC0420 = {
+			fileRef = 40607C1407493C3F00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C740749432A00DC0420 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = gsocket.c;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = gsockosx.cpp;
+			path = mac/corefoundation/gsockosx.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		40607C750749432A00DC0420 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = utilsexc_cf.cpp;
+			path = mac/corefoundation/utilsexc_cf.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		40607C760749432A00DC0420 = {
+			fileRef = 40607C740749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C770749432A00DC0420 = {
+			fileRef = 40607C750749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C780749432A00DC0420 = {
+			fileRef = 40607C740749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C790749432A00DC0420 = {
+			fileRef = 40607C750749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C7A0749432A00DC0420 = {
+			fileRef = 40607C740749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C7B0749432B00DC0420 = {
+			fileRef = 40607C750749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C7C0749432B00DC0420 = {
+			fileRef = 40607C740749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40607C7D0749432B00DC0420 = {
+			fileRef = 40607C750749432A00DC0420;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8107377A3600F7C08C = {
+			children = (
+				40607C740749432A00DC0420,
+				40607C750749432A00DC0420,
+				40670A8207377A6300F7C08C,
+				40670A8307377A6300F7C08C,
+			);
+			isa = PBXGroup;
+			name = mac/corefoundation;
+			path = mac/carbon;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		4086C59F063AA5C700D4CD53 = {
+		40670A8207377A6300F7C08C = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			path = glcanvas.cpp;
+			name = cfstring.cpp;
+			path = mac/corefoundation/cfstring.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		40670A8307377A6300F7C08C = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			name = stdpaths_cf.cpp;
+			path = mac/corefoundation/stdpaths_cf.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		40670A8407377A6400F7C08C = {
+			fileRef = 40670A8207377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8507377A6400F7C08C = {
+			fileRef = 40670A8307377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8607377A6400F7C08C = {
+			fileRef = 40670A8207377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8707377A6400F7C08C = {
+			fileRef = 40670A8307377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8807377A6400F7C08C = {
+			fileRef = 40670A8207377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8907377A6400F7C08C = {
+			fileRef = 40670A8307377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8A07377A6400F7C08C = {
+			fileRef = 40670A8207377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A8B07377A6400F7C08C = {
+			fileRef = 40670A8307377A6300F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9307377B1000F7C08C = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = gbsizer.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		4086C5A0063AA5C700D4CD53 = {
+		40670A9407377B1000F7C08C = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = gsockosx.c;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = sstream.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40670A9507377B1000F7C08C = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = stdpbase.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40670A9607377B1000F7C08C = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = uri.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40670A9707377B1000F7C08C = {
+			fileRef = 40670A9307377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9807377B1000F7C08C = {
+			fileRef = 40670A9407377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9907377B1000F7C08C = {
+			fileRef = 40670A9507377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9A07377B1000F7C08C = {
+			fileRef = 40670A9607377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9B07377B1000F7C08C = {
+			fileRef = 40670A9307377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9C07377B1000F7C08C = {
+			fileRef = 40670A9407377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9D07377B1000F7C08C = {
+			fileRef = 40670A9507377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9E07377B1000F7C08C = {
+			fileRef = 40670A9607377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670A9F07377B1000F7C08C = {
+			fileRef = 40670A9307377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA007377B1000F7C08C = {
+			fileRef = 40670A9407377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA107377B1000F7C08C = {
+			fileRef = 40670A9507377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA207377B1000F7C08C = {
+			fileRef = 40670A9607377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA307377B1000F7C08C = {
+			fileRef = 40670A9307377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA407377B1000F7C08C = {
+			fileRef = 40670A9407377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA507377B1000F7C08C = {
+			fileRef = 40670A9507377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40670AA607377B1000F7C08C = {
+			fileRef = 40670A9607377B1000F7C08C;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		407A90F6065742ED00F01665 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = spinctrl.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		4086C5A1063AA5C700D4CD53 = {
+		407A90F7065742ED00F01665 = {
+			fileRef = 407A90F6065742ED00F01665;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		407A90F8065742ED00F01665 = {
+			fileRef = 407A90F6065742ED00F01665;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		407A90F9065742ED00F01665 = {
+			fileRef = 407A90F6065742ED00F01665;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		407A90FA065742ED00F01665 = {
+			fileRef = 407A90F6065742ED00F01665;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4086C3A2063A454900D4CD53 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = sound.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		4086C59F063AA5C700D4CD53 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mpthread.cpp;
+			path = glcanvas.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -198,6 +673,7 @@
 		4086C742063AB2FF00D4CD53 = {
 			buildPhases = (
 				4086C743063AB2FF00D4CD53,
+				409E9DD5065140690091DE7E,
 				4086C744063AB2FF00D4CD53,
 				4086C746063AB2FF00D4CD53,
 				4086C8C8063AB2FF00D4CD53,
@@ -207,13 +683,16 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
+				DYLIB_CURRENT_VERSION = 2.5.3;
 				GCC_INPUT_FILETYPE = automatic;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = s;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../include/wx_xcode.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1";
+				GCC_PREFIX_HEADER = ../include/wx/wxprec.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
+				GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
+				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex tiff - $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon /usr/include";
 				LIBRARY_STYLE = STATIC;
 				OTHER_CFLAGS = "";
@@ -247,7 +726,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4086C745063AB2FF00D4CD53,
-				40B6E74D063D4ABA00442FB3,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -367,7 +845,6 @@
 				4086C7AE063AB2FF00D4CD53,
 				4086C7AF063AB2FF00D4CD53,
 				4086C7B0063AB2FF00D4CD53,
-				4086C7B1063AB2FF00D4CD53,
 				4086C7B2063AB2FF00D4CD53,
 				4086C7B3063AB2FF00D4CD53,
 				4086C7B4063AB2FF00D4CD53,
@@ -413,7 +890,6 @@
 				4086C7DC063AB2FF00D4CD53,
 				4086C7DD063AB2FF00D4CD53,
 				4086C7DE063AB2FF00D4CD53,
-				4086C7DF063AB2FF00D4CD53,
 				4086C7E0063AB2FF00D4CD53,
 				4086C7E1063AB2FF00D4CD53,
 				4086C7E2063AB2FF00D4CD53,
@@ -638,14 +1114,29 @@
 				4086C8BD063AB2FF00D4CD53,
 				4086C8BE063AB2FF00D4CD53,
 				4086C8BF063AB2FF00D4CD53,
-				4086C8C0063AB2FF00D4CD53,
 				4086C8C1063AB2FF00D4CD53,
-				4086C8C2063AB2FF00D4CD53,
-				4086C8C3063AB2FF00D4CD53,
 				4086C8C4063AB2FF00D4CD53,
 				4086C8C5063AB2FF00D4CD53,
 				4086C8C6063AB2FF00D4CD53,
 				4086C8C7063AB2FF00D4CD53,
+				407A90FA065742ED00F01665,
+				40F10E5806AD0230003C7AC3,
+				40F10E5906AD0230003C7AC3,
+				40DCE35006C744C90000D83E,
+				0A98CB560714687E007B4289,
+				0A98CB6B07146A06007B4289,
+				0A98CC480715CFBC007B4289,
+				0A98CC4C0715D03E007B4289,
+				40670A8407377A6400F7C08C,
+				40670A8507377A6400F7C08C,
+				40670A9707377B1000F7C08C,
+				40670A9807377B1000F7C08C,
+				40670A9907377B1000F7C08C,
+				40670A9A07377B1000F7C08C,
+				40607C1607493C3F00DC0420,
+				40607C760749432A00DC0420,
+				40607C770749432A00DC0420,
+				40ECB13A074BD1D0005AAC48,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1280,14 +1771,8 @@
 			settings = {
 			};
 		};
-		4086C7B0063AB2FF00D4CD53 = {
-			fileRef = F5A8605901FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086C7B1063AB2FF00D4CD53 = {
-			fileRef = F5A8605B01FA022C0175ACA7;
+		4086C7B0063AB2FF00D4CD53 = {
+			fileRef = F5A8605901FA022C0175ACA7;
 			isa = PBXBuildFile;
 			settings = {
 			};
@@ -1562,12 +2047,6 @@
 			settings = {
 			};
 		};
-		4086C7DF063AB2FF00D4CD53 = {
-			fileRef = F5A8609601FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086C7E0063AB2FF00D4CD53 = {
 			fileRef = F5A8609501FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -2912,30 +3391,12 @@
 			settings = {
 			};
 		};
-		4086C8C0063AB2FF00D4CD53 = {
-			fileRef = 4086C58C063AA59200D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086C8C1063AB2FF00D4CD53 = {
 			fileRef = 4086C59F063AA5C700D4CD53;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		4086C8C2063AB2FF00D4CD53 = {
-			fileRef = 4086C5A0063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086C8C3063AB2FF00D4CD53 = {
-			fileRef = 4086C5A1063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086C8C4063AB2FF00D4CD53 = {
 			fileRef = 4086C638063AAD4A00D4CD53;
 			isa = PBXBuildFile;
@@ -2963,6 +3424,7 @@
 		4086C8C8063AB2FF00D4CD53 = {
 			buildActionMask = 2147483647;
 			files = (
+				0A98CD2307172992007B4289,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2994,13 +3456,13 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
+				DYLIB_CURRENT_VERSION = 2.5.3;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../include/wx_xcode.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1";
+				GCC_PREFIX_HEADER = ../include/wx/wxprec.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
 				HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex tiff - $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon /usr/include";
 				LIBRARY_STYLE = STATIC;
 				OTHER_CFLAGS = "";
@@ -3034,7 +3496,6 @@
 		4086C8CE063AB30000D4CD53 = {
 			buildActionMask = 2147483647;
 			files = (
-				40B6E74C063D4ABA00442FB3,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3161,7 +3622,6 @@
 				4086C944063AB30000D4CD53,
 				4086C945063AB30000D4CD53,
 				4086C946063AB30000D4CD53,
-				4086C947063AB30000D4CD53,
 				4086C948063AB30000D4CD53,
 				4086C949063AB30000D4CD53,
 				4086C94A063AB30000D4CD53,
@@ -3267,7 +3727,6 @@
 				4086C9AE063AB30000D4CD53,
 				4086C9AF063AB30000D4CD53,
 				4086C9B0063AB30000D4CD53,
-				4086C9B1063AB30000D4CD53,
 				4086C9B2063AB30000D4CD53,
 				4086C9B3063AB30000D4CD53,
 				4086C9B4063AB30000D4CD53,
@@ -3419,14 +3878,29 @@
 				4086CA46063AB30000D4CD53,
 				4086CA47063AB30000D4CD53,
 				4086CA48063AB30000D4CD53,
-				4086CA49063AB30000D4CD53,
 				4086CA4A063AB30000D4CD53,
-				4086CA4B063AB30000D4CD53,
-				4086CA4C063AB30000D4CD53,
 				4086CA4D063AB30000D4CD53,
 				4086CA4E063AB30000D4CD53,
 				4086CA4F063AB30000D4CD53,
 				4086CA50063AB30000D4CD53,
+				407A90F9065742ED00F01665,
+				40F10E5A06AD0230003C7AC3,
+				40F10E5B06AD0230003C7AC3,
+				40DCE35106C744C90000D83E,
+				0A98CB570714687E007B4289,
+				0A98CB6C07146A06007B4289,
+				0A98CC490715CFBC007B4289,
+				0A98CC4D0715D045007B4289,
+				40670A8607377A6400F7C08C,
+				40670A8707377A6400F7C08C,
+				40670A9B07377B1000F7C08C,
+				40670A9C07377B1000F7C08C,
+				40670A9D07377B1000F7C08C,
+				40670A9E07377B1000F7C08C,
+				40607C1807493C3F00DC0420,
+				40607C780749432A00DC0420,
+				40607C790749432A00DC0420,
+				40ECB13B074BD1D0005AAC48,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4145,12 +4619,6 @@
 			settings = {
 			};
 		};
-		4086C947063AB30000D4CD53 = {
-			fileRef = F5A8605B01FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086C948063AB30000D4CD53 = {
 			fileRef = F5A8606201FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -4781,12 +5249,6 @@
 			settings = {
 			};
 		};
-		4086C9B1063AB30000D4CD53 = {
-			fileRef = F5A8609601FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086C9B2063AB30000D4CD53 = {
 			fileRef = F5A8609501FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -5693,30 +6155,12 @@
 			settings = {
 			};
 		};
-		4086CA49063AB30000D4CD53 = {
-			fileRef = 4086C58C063AA59200D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CA4A063AB30000D4CD53 = {
 			fileRef = 4086C59F063AA5C700D4CD53;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		4086CA4B063AB30000D4CD53 = {
-			fileRef = 4086C5A0063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086CA4C063AB30000D4CD53 = {
-			fileRef = 4086C5A1063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CA4D063AB30000D4CD53 = {
 			fileRef = 4086C638063AAD4A00D4CD53;
 			isa = PBXBuildFile;
@@ -5744,6 +6188,7 @@
 		4086CA51063AB30000D4CD53 = {
 			buildActionMask = 2147483647;
 			files = (
+				0A98CD2407172992007B4289,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5775,14 +6220,14 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
+				DYLIB_CURRENT_VERSION = 2.5.3;
+				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_INPUT_FILETYPE = automatic;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../include/wx_xcode.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ WXMAKINGDLL __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1";
+				GCC_PREFIX_HEADER = ../include/wx/wxprec.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ WXMAKINGDLL __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
 				HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex common jpeg png regex tiff - $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon /usr/include";
 				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.1;
@@ -5818,7 +6263,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4086CA58063AB30000D4CD53,
-				40B6E74A063D4ABA00442FB3,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5938,7 +6382,6 @@
 				4086CAC1063AB30000D4CD53,
 				4086CAC2063AB30000D4CD53,
 				4086CAC3063AB30000D4CD53,
-				4086CAC4063AB30000D4CD53,
 				4086CAC5063AB30000D4CD53,
 				4086CAC6063AB30000D4CD53,
 				4086CAC7063AB30000D4CD53,
@@ -5984,7 +6427,6 @@
 				4086CAEF063AB30000D4CD53,
 				4086CAF0063AB30000D4CD53,
 				4086CAF1063AB30000D4CD53,
-				4086CAF2063AB30000D4CD53,
 				4086CAF3063AB30000D4CD53,
 				4086CAF4063AB30000D4CD53,
 				4086CAF5063AB30000D4CD53,
@@ -6209,14 +6651,29 @@
 				4086CBD0063AB30000D4CD53,
 				4086CBD1063AB30000D4CD53,
 				4086CBD2063AB30000D4CD53,
-				4086CBD3063AB30000D4CD53,
 				4086CBD4063AB30000D4CD53,
-				4086CBD5063AB30000D4CD53,
-				4086CBD6063AB30000D4CD53,
 				4086CBD7063AB30000D4CD53,
 				4086CBD8063AB30000D4CD53,
 				4086CBD9063AB30000D4CD53,
 				4086CBDA063AB30000D4CD53,
+				407A90F7065742ED00F01665,
+				40F10E5C06AD0230003C7AC3,
+				40F10E5D06AD0230003C7AC3,
+				40DCE35206C744C90000D83E,
+				0A98CB580714687E007B4289,
+				0A98CB6D07146A06007B4289,
+				0A98CC4A0715CFBC007B4289,
+				0A98CC4E0715D04C007B4289,
+				40670A8807377A6400F7C08C,
+				40670A8907377A6400F7C08C,
+				40670A9F07377B1000F7C08C,
+				40670AA007377B1000F7C08C,
+				40670AA107377B1000F7C08C,
+				40670AA207377B1000F7C08C,
+				40607C1A07493C3F00DC0420,
+				40607C7A0749432A00DC0420,
+				40607C7B0749432B00DC0420,
+				40ECB13C074BD1D0005AAC48,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -6857,12 +7314,6 @@
 			settings = {
 			};
 		};
-		4086CAC4063AB30000D4CD53 = {
-			fileRef = F5A8605B01FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CAC5063AB30000D4CD53 = {
 			fileRef = F5A8605E01FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -7133,12 +7584,6 @@
 			settings = {
 			};
 		};
-		4086CAF2063AB30000D4CD53 = {
-			fileRef = F5A8609601FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CAF3063AB30000D4CD53 = {
 			fileRef = F5A8609501FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -8483,30 +8928,12 @@
 			settings = {
 			};
 		};
-		4086CBD3063AB30000D4CD53 = {
-			fileRef = 4086C58C063AA59200D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CBD4063AB30000D4CD53 = {
 			fileRef = 4086C59F063AA5C700D4CD53;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		4086CBD5063AB30000D4CD53 = {
-			fileRef = 4086C5A0063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086CBD6063AB30000D4CD53 = {
-			fileRef = 4086C5A1063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CBD7063AB30000D4CD53 = {
 			fileRef = 4086C638063AAD4A00D4CD53;
 			isa = PBXBuildFile;
@@ -8538,6 +8965,7 @@
 				4086CBDD063AB30000D4CD53,
 				4086CBDE063AB30000D4CD53,
 				405DD168063C2BFC00F579EE,
+				0A98CD2507172992007B4289,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8587,13 +9015,13 @@
 			);
 			buildSettings = {
 				DYLIB_COMPATIBILITY_VERSION = 2.5;
-				DYLIB_CURRENT_VERSION = 2.5.0;
+				DYLIB_CURRENT_VERSION = 2.5.3;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PFE_FILE_C_DIALECTS = "c++";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ../include/wx_xcode.h;
-				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA WXMAKINGDLL __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1";
+				GCC_PREFIX_HEADER = ../include/wx/wxprec.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA WXMAKINGDLL __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES __WXMAC_XCODE__=1 WX_PRECOMP=1";
 				HEADER_SEARCH_PATHS = "${SYMROOT}/include ../include mac/carbon/morefilex jpeg common png regex tiff - $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon /usr/include";
 				LIBRARY_STYLE = DYNAMIC;
 				OTHER_CFLAGS = "";
@@ -8627,7 +9055,6 @@
 		4086CBE4063AB30000D4CD53 = {
 			buildActionMask = 2147483647;
 			files = (
-				40B6E74B063D4ABA00442FB3,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8754,7 +9181,6 @@
 				4086CC5A063AB30000D4CD53,
 				4086CC5B063AB30000D4CD53,
 				4086CC5C063AB30000D4CD53,
-				4086CC5D063AB30000D4CD53,
 				4086CC5E063AB30000D4CD53,
 				4086CC5F063AB30000D4CD53,
 				4086CC60063AB30000D4CD53,
@@ -8860,7 +9286,6 @@
 				4086CCC4063AB30000D4CD53,
 				4086CCC5063AB30000D4CD53,
 				4086CCC6063AB30000D4CD53,
-				4086CCC7063AB30000D4CD53,
 				4086CCC8063AB30000D4CD53,
 				4086CCC9063AB30000D4CD53,
 				4086CCCA063AB30000D4CD53,
@@ -9012,14 +9437,29 @@
 				4086CD5C063AB30000D4CD53,
 				4086CD5D063AB30000D4CD53,
 				4086CD5E063AB30000D4CD53,
-				4086CD5F063AB30000D4CD53,
 				4086CD60063AB30000D4CD53,
-				4086CD61063AB30000D4CD53,
-				4086CD62063AB30000D4CD53,
 				4086CD63063AB30000D4CD53,
 				4086CD64063AB30000D4CD53,
 				4086CD65063AB30000D4CD53,
 				4086CD66063AB30000D4CD53,
+				407A90F8065742ED00F01665,
+				40F10E5E06AD0230003C7AC3,
+				40F10E5F06AD0230003C7AC3,
+				40DCE35306C744C90000D83E,
+				0A98CB590714687E007B4289,
+				0A98CB6E07146A06007B4289,
+				0A98CC4B0715CFBC007B4289,
+				0A98CC4F0715D053007B4289,
+				40670A8A07377A6400F7C08C,
+				40670A8B07377A6400F7C08C,
+				40670AA307377B1000F7C08C,
+				40670AA407377B1000F7C08C,
+				40670AA507377B1000F7C08C,
+				40670AA607377B1000F7C08C,
+				40607C1C07493C3F00DC0420,
+				40607C7C0749432B00DC0420,
+				40607C7D0749432B00DC0420,
+				40ECB13D074BD1D0005AAC48,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -9738,12 +10178,6 @@
 			settings = {
 			};
 		};
-		4086CC5D063AB30000D4CD53 = {
-			fileRef = F5A8605B01FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CC5E063AB30000D4CD53 = {
 			fileRef = F5A8606201FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -10374,12 +10808,6 @@
 			settings = {
 			};
 		};
-		4086CCC7063AB30000D4CD53 = {
-			fileRef = F5A8609601FA022C0175ACA7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CCC8063AB30000D4CD53 = {
 			fileRef = F5A8609501FA022C0175ACA7;
 			isa = PBXBuildFile;
@@ -11286,30 +11714,12 @@
 			settings = {
 			};
 		};
-		4086CD5F063AB30000D4CD53 = {
-			fileRef = 4086C58C063AA59200D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CD60063AB30000D4CD53 = {
 			fileRef = 4086C59F063AA5C700D4CD53;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		4086CD61063AB30000D4CD53 = {
-			fileRef = 4086C5A0063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		4086CD62063AB30000D4CD53 = {
-			fileRef = 4086C5A1063AA5C700D4CD53;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		4086CD63063AB30000D4CD53 = {
 			fileRef = 4086C638063AAD4A00D4CD53;
 			isa = PBXBuildFile;
@@ -11341,6 +11751,7 @@
 				4086CD69063AB30000D4CD53,
 				4086CD6A063AB30000D4CD53,
 				405DD169063C2BFC00F579EE,
+				0A98CD2607172992007B4289,
 			);
 			isa = PBXFrameworksBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -11447,34 +11858,139 @@
 			target = 4086CBE2063AB30000D4CD53;
 			targetProxy = 4086D208063BC05E00D4CD53;
 		};
-		40B6E749063D4ABA00442FB3 = {
+		409E9DD5065140690091DE7E = {
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 7;
+			files = (
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		40DCE34F06C744C90000D83E = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = wx_xcode.h;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = gsocket.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40DCE35006C744C90000D83E = {
+			fileRef = 40DCE34F06C744C90000D83E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40DCE35106C744C90000D83E = {
+			fileRef = 40DCE34F06C744C90000D83E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40DCE35206C744C90000D83E = {
+			fileRef = 40DCE34F06C744C90000D83E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40DCE35306C744C90000D83E = {
+			fileRef = 40DCE34F06C744C90000D83E;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40ECB139074BD1D0005AAC48 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = stdpaths.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40ECB13A074BD1D0005AAC48 = {
+			fileRef = 40ECB139074BD1D0005AAC48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40ECB13B074BD1D0005AAC48 = {
+			fileRef = 40ECB139074BD1D0005AAC48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40ECB13C074BD1D0005AAC48 = {
+			fileRef = 40ECB139074BD1D0005AAC48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40ECB13D074BD1D0005AAC48 = {
+			fileRef = 40ECB139074BD1D0005AAC48;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40F10E5606AD0230003C7AC3 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = tglbtn.cpp;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		40F10E5706AD0230003C7AC3 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = thread.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		40B6E74A063D4ABA00442FB3 = {
-			fileRef = 40B6E749063D4ABA00442FB3;
+		40F10E5806AD0230003C7AC3 = {
+			fileRef = 40F10E5606AD0230003C7AC3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40F10E5906AD0230003C7AC3 = {
+			fileRef = 40F10E5706AD0230003C7AC3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40F10E5A06AD0230003C7AC3 = {
+			fileRef = 40F10E5606AD0230003C7AC3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40F10E5B06AD0230003C7AC3 = {
+			fileRef = 40F10E5706AD0230003C7AC3;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		40F10E5C06AD0230003C7AC3 = {
+			fileRef = 40F10E5606AD0230003C7AC3;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		40B6E74B063D4ABA00442FB3 = {
-			fileRef = 40B6E749063D4ABA00442FB3;
+		40F10E5D06AD0230003C7AC3 = {
+			fileRef = 40F10E5706AD0230003C7AC3;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		40B6E74C063D4ABA00442FB3 = {
-			fileRef = 40B6E749063D4ABA00442FB3;
+		40F10E5E06AD0230003C7AC3 = {
+			fileRef = 40F10E5606AD0230003C7AC3;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		40B6E74D063D4ABA00442FB3 = {
-			fileRef = 40B6E749063D4ABA00442FB3;
+		40F10E5F06AD0230003C7AC3 = {
+			fileRef = 40F10E5706AD0230003C7AC3;
 			isa = PBXBuildFile;
 			settings = {
 			};
@@ -11490,23 +12006,17 @@
 //4F3
 //4F4
 		4F0BB7EC011F40E904CA0E50 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
 				ZERO_LINK = YES;
 			};
 			isa = PBXBuildStyle;
 			name = Development;
 		};
 		4F0BB7ED011F40E904CA0E50 = {
-			buildRules = (
-			);
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -11755,7 +12265,6 @@
 		};
 		F5A85C1A01FA022A0175ACA7 = {
 			children = (
-				40B6E749063D4ABA00442FB3,
 				F5A85C1C01FA022A0175ACA7,
 				F5FD822102CCECE601000133,
 			);
@@ -11808,7 +12317,6 @@
 				F5A85C4401FA022A0175ACA7,
 				F5A85C4501FA022A0175ACA7,
 				F5A85C4601FA022A0175ACA7,
-				F5CC83DF0379C20901000133,
 				F5A85C4701FA022A0175ACA7,
 				F5A85C4801FA022A0175ACA7,
 				F5A85C4901FA022A0175ACA7,
@@ -11822,7 +12330,6 @@
 				F5A85C5101FA022A0175ACA7,
 				F5A85C5201FA022A0175ACA7,
 				F5A85C5301FA022A0175ACA7,
-				F5CC83E00379C20901000133,
 				F5A85C5401FA022A0175ACA7,
 				F5A85C5501FA022A0175ACA7,
 				F5A85C5601FA022A0175ACA7,
@@ -11835,7 +12342,6 @@
 				F5A85C5D01FA022A0175ACA7,
 				F5A85C5E01FA022A0175ACA7,
 				F5A85C6001FA022A0175ACA7,
-				F5CC83E10379C20901000133,
 				F5A85C6101FA022A0175ACA7,
 				F5A85C6201FA022A0175ACA7,
 				F5A85C6301FA022A0175ACA7,
@@ -11863,14 +12369,12 @@
 				F5A85CB301FA022A0175ACA7,
 				F5A85CB401FA022A0175ACA7,
 				F5A85CF901FA022B0175ACA7,
-				F5CC83E20379C20901000133,
 				F5A85CFA01FA022B0175ACA7,
 				F5A85CFB01FA022B0175ACA7,
 				F5A85CFC01FA022B0175ACA7,
 				F5A85CFD01FA022B0175ACA7,
 				F5A85CFF01FA022B0175ACA7,
 				F5A85D2101FA022B0175ACA7,
-				F5CC83E30379C20901000133,
 				F5A85D2201FA022B0175ACA7,
 				F5A85D2301FA022B0175ACA7,
 				F5A85D2401FA022B0175ACA7,
@@ -11884,7 +12388,6 @@
 				F5A85D2C01FA022B0175ACA7,
 				F5A85D2D01FA022B0175ACA7,
 				F5A85D2E01FA022B0175ACA7,
-				F5CC83E40379C20901000133,
 				F5A85D2F01FA022B0175ACA7,
 				F5A85D3001FA022B0175ACA7,
 				F5A85D3101FA022B0175ACA7,
@@ -11892,7 +12395,6 @@
 				F5A85D3301FA022B0175ACA7,
 				F5A85D3401FA022B0175ACA7,
 				F5A85D3501FA022B0175ACA7,
-				F5CC83E50379C20901000133,
 				F5A85D3601FA022B0175ACA7,
 				F5A85D3701FA022B0175ACA7,
 				F5A8703A01FA0B7F0175ACA7,
@@ -11911,7 +12413,6 @@
 				F5A85DAE01FA022B0175ACA7,
 				F5A85DAF01FA022B0175ACA7,
 				F5A85DF101FA022B0175ACA7,
-				F5CC83E60379C20901000133,
 				F5A85DF201FA022B0175ACA7,
 				F5A85E9701FA022B0175ACA7,
 				F5A85E9801FA022B0175ACA7,
@@ -11928,7 +12429,6 @@
 				F5A85F0901FA022B0175ACA7,
 				F5A85F0A01FA022B0175ACA7,
 				F5A85F0E01FA022B0175ACA7,
-				F5CC83E70379C20901000133,
 				F5A85F1401FA022B0175ACA7,
 				F5A85F1501FA022B0175ACA7,
 				F5A85F1601FA022B0175ACA7,
@@ -11952,9 +12452,9 @@
 				F5A85F2B01FA022B0175ACA7,
 				F5A85F2C01FA022B0175ACA7,
 				F5A85F2D01FA022B0175ACA7,
+				F5A85F3001FA022B0175ACA7,
 				F5A85F2E01FA022B0175ACA7,
 				F5A85F2F01FA022B0175ACA7,
-				F5A85F3001FA022B0175ACA7,
 				F5A85F3101FA022B0175ACA7,
 				F5A85F3201FA022B0175ACA7,
 				F5A85F3301FA022B0175ACA7,
@@ -11963,7 +12463,6 @@
 				F5A85F3601FA022B0175ACA7,
 				F5A85F3701FA022B0175ACA7,
 				F5A85F3801FA022B0175ACA7,
-				F5A85F3901FA022B0175ACA7,
 				F5A85F3A01FA022B0175ACA7,
 				F5A85F3B01FA022B0175ACA7,
 				F5A85F3C01FA022B0175ACA7,
@@ -12698,12 +13197,8 @@
 				F5A85C8801FA022A0175ACA7,
 				F5A85C8901FA022A0175ACA7,
 				F5A85C8A01FA022A0175ACA7,
-				F5A85C8B01FA022A0175ACA7,
 				F5A85C8C01FA022A0175ACA7,
 				F5A85C8D01FA022A0175ACA7,
-				F5A85C8E01FA022A0175ACA7,
-				F5A85C8F01FA022A0175ACA7,
-				F5A85C9001FA022A0175ACA7,
 				F5A85C9201FA022A0175ACA7,
 				F5A85C9401FA022A0175ACA7,
 				F5A85C9501FA022A0175ACA7,
@@ -12724,7 +13219,6 @@
 				F5A85CA801FA022A0175ACA7,
 				F5A85CA901FA022A0175ACA7,
 				F5A85CAC01FA022A0175ACA7,
-				F5A85CAD01FA022A0175ACA7,
 				F5A85CAF01FA022A0175ACA7,
 			);
 			isa = PBXGroup;
@@ -12844,14 +13338,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A85C8B01FA022A0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = gridg.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A85C8C01FA022A0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -12868,30 +13354,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A85C8E01FA022A0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = helphtml.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		F5A85C8F01FA022A0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = helpwxht.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		F5A85C9001FA022A0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = helpxlp.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A85C9201FA022A0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -13052,14 +13514,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A85CAD01FA022A0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = treelay.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A85CAF01FA022A0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -13562,7 +14016,6 @@
 				F5A85D8901FA022B0175ACA7,
 				F5A85D8A01FA022B0175ACA7,
 				F5A85D8B01FA022B0175ACA7,
-				F5A85D8C01FA022B0175ACA7,
 				F5A85D8D01FA022B0175ACA7,
 			);
 			isa = PBXGroup;
@@ -14186,14 +14639,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A85D8C01FA022B0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = wave.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A85D8D01FA022B0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -14734,14 +15179,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A85F3901FA022B0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			path = tbarsmpl.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A85F3A01FA022B0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -15089,6 +15526,7 @@
 				F5A8606E01FA022C0175ACA7,
 				F5A860F101FA022C0175ACA7,
 				F5A8613E01FA022C0175ACA7,
+				40670A8107377A3600F7C08C,
 				F5A8619901FA022C0175ACA7,
 				F5A863AB01FA022C0175ACA7,
 				F5A8641801FA022D0175ACA7,
@@ -15102,6 +15540,7 @@
 		};
 		F5A85FDD01FA022B0175ACA7 = {
 			children = (
+				40607C1407493C3F00DC0420,
 				CA0CB57B0450773900000102,
 				CA60175604D43A2700000080,
 				F5A85FDF01FA022B0175ACA7,
@@ -15160,6 +15599,7 @@
 				F5A8601201FA022B0175ACA7,
 				F5A8601301FA022B0175ACA7,
 				F5A8601401FA022B0175ACA7,
+				40670A9307377B1000F7C08C,
 				F5A8601501FA022B0175ACA7,
 				F5A8601601FA022B0175ACA7,
 				F5A8601701FA022B0175ACA7,
@@ -15214,6 +15654,9 @@
 				F5AC2EDE03803A3601000133,
 				F5A8604A01FA022C0175ACA7,
 				F5A8604B01FA022C0175ACA7,
+				40670A9407377B1000F7C08C,
+				0A98CB6A07146A06007B4289,
+				40670A9507377B1000F7C08C,
 				F5A8604C01FA022C0175ACA7,
 				CA60175E04D43A8100000080,
 				F5A8604D01FA022C0175ACA7,
@@ -15230,7 +15673,7 @@
 				F5A8605701FA022C0175ACA7,
 				F5A8605801FA022C0175ACA7,
 				F5A8605901FA022C0175ACA7,
-				F5A8605B01FA022C0175ACA7,
+				40670A9607377B1000F7C08C,
 				F5A8605D01FA022C0175ACA7,
 				F5A8605E01FA022C0175ACA7,
 				F5A8605F01FA022C0175ACA7,
@@ -16084,8 +16527,8 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			name = statbar.cpp;
-			path = common/statbar.cpp;
+			name = stockitem.cpp;
+			path = common/stockitem.cpp;
 			refType = 2;
 			sourceTree = SOURCE_ROOT;
 		};
@@ -16203,14 +16646,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A8605B01FA022C0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = unzip.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A8605D01FA022C0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -16338,7 +16773,6 @@
 				F5A8609401FA022C0175ACA7,
 				F5A8609501FA022C0175ACA7,
 				CA60176D04D43CAA00000080,
-				F5A8609601FA022C0175ACA7,
 				F5A8609701FA022C0175ACA7,
 				F5A8609801FA022C0175ACA7,
 				F5A8609A01FA022C0175ACA7,
@@ -16570,14 +17004,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5A8609601FA022C0175ACA7 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = spinctlg.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		F5A8609701FA022C0175ACA7 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;
@@ -17289,9 +17715,9 @@
 				F5A861BE01FA022C0175ACA7,
 				F5A861BF01FA022C0175ACA7,
 				F5A861C001FA022C0175ACA7,
-				F5A861C101FA022C0175ACA7,
-				4086C5A0063AA5C700D4CD53,
+				0A98CC470715CFBC007B4289,
 				4086C59F063AA5C700D4CD53,
+				0A98CB550714687E007B4289,
 				F5A861C501FA022C0175ACA7,
 				F5A861C601FA022C0175ACA7,
 				F5A861C701FA022C0175ACA7,
@@ -17320,14 +17746,17 @@
 				F5A861F401FA022C0175ACA7,
 				4086C3A2063A454900D4CD53,
 				F5A861F501FA022C0175ACA7,
+				407A90F6065742ED00F01665,
 				F5A861F701FA022C0175ACA7,
 				F5A861F801FA022C0175ACA7,
 				F5A861F901FA022C0175ACA7,
 				F5A861FB01FA022C0175ACA7,
 				F5A861FC01FA022C0175ACA7,
 				F5A861FD01FA022C0175ACA7,
+				F5A861C101FA022C0175ACA7,
 				F5A861FF01FA022C0175ACA7,
-				4086C5A1063AA5C700D4CD53,
+				40F10E5606AD0230003C7AC3,
+				40F10E5706AD0230003C7AC3,
 				F5A8620101FA022C0175ACA7,
 				F5A8620201FA022C0175ACA7,
 				F5A8620301FA022C0175ACA7,
@@ -17618,7 +18047,7 @@
 			fileEncoding = 30;
 			isa = PBXFileReference;
 			lastKnownFileType = sourcecode.cpp.cpp;
-			path = gdiobj.cpp;
+			path = taskbar.cpp;
 			refType = 4;
 			sourceTree = "<group>";
 		};
@@ -18482,8 +18911,9 @@
 		};
 		F5A8648A01FA022D0175ACA7 = {
 			children = (
+				40ECB139074BD1D0005AAC48,
 				CA60177204D43D2300000080,
-				4086C58C063AA59200D4CD53,
+				40DCE34F06C744C90000D83E,
 				F5A8649201FA022D0175ACA7,
 				F5A8649401FA022D0175ACA7,
 			);
@@ -18542,8 +18972,7 @@
 			sourceTree = "<group>";
 		};
 		F5C5D3DF01FA2D0A01D0F0BA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
+			isa = PBXFileReference;
 			lastKnownFileType = wrapper.framework;
 			name = System.framework;
 			path = /System/Library/Frameworks/System.framework;
@@ -18566,87 +18995,6 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
-		F5CC83DF0379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = dcbuffer.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/dcbuffer.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E00379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = display.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/display.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E10379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = features.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/features.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E20379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = hashmap.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/hashmap.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E30379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = iconbndl.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/iconbndl.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E40379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = ipc.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/ipc.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E50379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = listbase.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/listbase.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E60379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = msgout.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/msgout.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		F5CC83E70379C20901000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = file;
-			name = ptr_scpd.h;
-			path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/ptr_scpd.h;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
 		F5CC83E80379C20901000133 = {
 			fileEncoding = 30;
 			isa = PBXFileReference;