Fixes and XCode 2.3 update

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

diff --git a/samples/minimal/minimal.xcodeproj/project.pbxproj b/samples/minimal/minimal.xcodeproj/project.pbxproj
index be3b0aaa4b830e7e2e92f2edf8bc7e8d6c00174b..c8fb6971b5e1c455a4c44f0559fddaaf14a31e38 100644 (file)
--- a/samples/minimal/minimal.xcodeproj/project.pbxproj
+++ b/samples/minimal/minimal.xcodeproj/project.pbxproj
@@ -31,8 +31,6 @@
                1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAF9085664390032BCF7 /* OpenGL.framework */; };
                1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1842CAFA085664390032BCF7 /* WebKit.framework */; };
                403608C909953BFD00700A19 /* minimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F591E05701FCC5DE01000133 /* minimal.cpp */; };
-               403BFCA80A1F893400D89D00 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403BFCA70A1F893400D89D00 /* AppKit.framework */; };
-               403BFCA90A1F893400D89D00 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 403BFCA70A1F893400D89D00 /* AppKit.framework */; };
                4086D0E5063BBC5B00D4CD53 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = F5F5A69A02CDB0E101000133 /* wxmac.icns */; };
                4086D0E9063BBC5B00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
                4086D0EC063BBC5B00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; };
@@ -41,6 +39,8 @@
                4086D109063BBC5C00D4CD53 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
                4086D10B063BBC5C00D4CD53 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA60173504D423C000000080 /* System.framework */; };
                409F03A10977B97B00D1030F /* libwx_mac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 409F039A0977B96200D1030F /* libwx_mac_static.a */; };
+               40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; };
+               40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F017460A306CAD00AC9076 /* AppKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -58,19 +58,19 @@
                        remoteGlobalIDString = 4086D102063BBC5C00D4CD53;
                        remoteInfo = DynamicDebug;
                };
-               407AA07109D30FFB003E4CF8 /* PBXContainerItemProxy */ = {
+               409F03990977B96200D1030F /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */;
                        proxyType = 2;
-                       remoteGlobalIDString = 4086CBE1063AB30000D4CD53;
-                       remoteInfo = dynamic;
+                       remoteGlobalIDString = 4086C8CB063AB30000D4CD53;
+                       remoteInfo = static;
                };
-               409F03990977B96200D1030F /* PBXContainerItemProxy */ = {
+               40F017220A3067FE00AC9076 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
                        containerPortal = 409F03930977B96200D1030F /* wxWindows.xcodeproj */;
                        proxyType = 2;
-                       remoteGlobalIDString = 4086C8CB063AB30000D4CD53;
-                       remoteInfo = static;
+                       remoteGlobalIDString = 4086CBE1063AB30000D4CD53 /* libwx_mac.dylib */;
+                       remoteInfo = dynamic;
                };
 /* End PBXContainerItemProxy section */
 
@@ -94,9 +94,9 @@
                1864B4F208566CAB00E32E9B /* minimalDynamic.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimalDynamic.app; sourceTree = BUILT_PRODUCTS_DIR; };
                1864B4F408566CAB00E32E9B /* minimal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = minimal.app; sourceTree = BUILT_PRODUCTS_DIR; };
                20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-               403BFCA70A1F893400D89D00 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                4086D0EF063BBC5B00D4CD53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
                409F03930977B96200D1030F /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = ../../src/wxWindows.xcodeproj; sourceTree = SOURCE_ROOT; };
+               40F017460A306CAD00AC9076 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
                CA60173504D423C000000080 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
                F591E05701FCC5DE01000133 /* minimal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = minimal.cpp; sourceTree = SOURCE_ROOT; };
                F5F5A69A02CDB0E101000133 /* wxmac.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = wxmac.icns; path = ../../src/mac/wxmac.icns; sourceTree = SOURCE_ROOT; };
@@ -114,7 +114,7 @@
                                1842CAFC085664390032BCF7 /* IOKit.framework in Frameworks */,
                                1842CAFD085664390032BCF7 /* OpenGL.framework in Frameworks */,
                                1842CAFE085664390032BCF7 /* WebKit.framework in Frameworks */,
-                               403BFCA90A1F893400D89D00 /* AppKit.framework in Frameworks */,
+                               40F017470A306CAD00AC9076 /* AppKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -128,7 +128,7 @@
                                1842CB00085664390032BCF7 /* IOKit.framework in Frameworks */,
                                1842CB01085664390032BCF7 /* OpenGL.framework in Frameworks */,
                                1842CB02085664390032BCF7 /* WebKit.framework in Frameworks */,
-                               403BFCA80A1F893400D89D00 /* AppKit.framework in Frameworks */,
+                               40F017480A306CAD00AC9076 /* AppKit.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -176,7 +176,7 @@
                20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
                        isa = PBXGroup;
                        children = (
-                               403BFCA70A1F893400D89D00 /* AppKit.framework */,
+                               40F017460A306CAD00AC9076 /* AppKit.framework */,
                                20286C33FDCF999611CA2CEA /* Carbon.framework */,
                                CA60173504D423C000000080 /* System.framework */,
                                1842CAF7085664390032BCF7 /* AGL.framework */,
@@ -191,7 +191,7 @@
                        isa = PBXGroup;
                        children = (
                                409F039A0977B96200D1030F /* libwx_mac_static.a */,
-                               407AA07209D30FFB003E4CF8 /* libwx_mac.dylib */,
+                               40F017230A3067FE00AC9076 /* libwx_mac.dylib */,
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -283,13 +283,6 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-               407AA07209D30FFB003E4CF8 /* libwx_mac.dylib */ = {
-                       isa = PBXReferenceProxy;
-                       fileType = "compiled.mach-o.dylib";
-                       path = libwx_mac.dylib;
-                       remoteRef = 407AA07109D30FFB003E4CF8 /* PBXContainerItemProxy */;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
                409F039A0977B96200D1030F /* libwx_mac_static.a */ = {
                        isa = PBXReferenceProxy;
                        fileType = archive.ar;
@@ -297,6 +290,13 @@
                        remoteRef = 409F03990977B96200D1030F /* PBXContainerItemProxy */;
                        sourceTree = BUILT_PRODUCTS_DIR;
                };
+               40F017230A3067FE00AC9076 /* libwx_mac.dylib */ = {
+                       isa = PBXReferenceProxy;
+                       fileType = "compiled.mach-o.dylib";
+                       path = libwx_mac.dylib;
+                       remoteRef = 40F017220A3067FE00AC9076 /* PBXContainerItemProxy */;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -439,6 +439,8 @@
                                        "WX_PRECOMP=1",
                                        MACOS_CLASSIC,
                                );
+                               GCC_VERSION_i386 = 4.0;
+                               GCC_VERSION_ppc = 3.3;
                                INSTALL_PATH = "$(HOME)/Applications";
                                LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../src/build/Deployment";
                                MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
@@ -488,7 +490,6 @@
                                OTHER_LDFLAGS = (
                                        "-liconv",
                                        "-lz",
-                                       "-lwx_mac",
                                );
                                PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic";
                                USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
@@ -499,6 +500,7 @@
                                        "-Wno-unknown-pragmas",
                                );
                                ZERO_LINK = NO;
+                               wxDylib = ../../src/build/Development/libwx_macd.dylib;
                        };
                        name = Development;
                };
@@ -531,7 +533,6 @@
                                OTHER_LDFLAGS = (
                                        "-liconv",
                                        "-lz",
-                                       "-lwx_mac",
                                );
                                PRODUCT_NAME = "$(PRODUCT_NAME)Dynamic";
                                USER_HEADER_SEARCH_PATHS = "${SYMROOT}/include ../../include ../../src/build/include .";
@@ -542,6 +543,7 @@
                                        "-Wno-unknown-pragmas",
                                );
                                ZERO_LINK = NO;
+                               wxDylib = ../../src/build/Deployment/libwx_mac.dylib;
                        };
                        name = Deployment;
                };

diff --git a/src/wxWindows.xcodeproj/project.pbxproj b/src/wxWindows.xcodeproj/project.pbxproj
index c16b973d59f2ae0acb44462d842c10c3e77d1a05..f19d887ee619859696d076556ef23c2774170403 100644 (file)
--- a/src/wxWindows.xcodeproj/project.pbxproj
+++ b/src/wxWindows.xcodeproj/project.pbxproj
@@ -12,18 +12,6 @@
                        buildConfigurationList = 18B5B99A08564B5D002803C9 /* Build configuration list for PBXAggregateTarget "Build All" */;
                        buildPhases = (
                        );
-                       buildSettings = {
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_REZFLAGS = "";
-                               PRODUCT_NAME = "Build All";
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                                4086D203063BC05E00D4CD53 /* PBXTargetDependency */,
                                4086D207063BC05E00D4CD53 /* PBXTargetDependency */,
@@ -313,7 +301,6 @@
                4086C83B063AB2FF00D4CD53 /* notebmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861E801FA022C0175ACA7 /* notebmac.cpp */; };
                4086C83C063AB2FF00D4CD53 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861E901FA022C0175ACA7 /* palette.cpp */; };
                4086C83D063AB2FF00D4CD53 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EA01FA022C0175ACA7 /* pen.cpp */; };
-               4086C83E063AB2FF00D4CD53 /* pnghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EB01FA022C0175ACA7 /* pnghand.cpp */; };
                4086C83F063AB2FF00D4CD53 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EE01FA022C0175ACA7 /* printmac.cpp */; };
                4086C840063AB2FF00D4CD53 /* radiobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EF01FA022C0175ACA7 /* radiobox.cpp */; };
                4086C841063AB2FF00D4CD53 /* printdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861ED01FA022C0175ACA7 /* printdlg.cpp */; };
@@ -689,7 +676,6 @@
                4086CB4E063AB30000D4CD53 /* notebmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861E801FA022C0175ACA7 /* notebmac.cpp */; };
                4086CB4F063AB30000D4CD53 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861E901FA022C0175ACA7 /* palette.cpp */; };
                4086CB50063AB30000D4CD53 /* pen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EA01FA022C0175ACA7 /* pen.cpp */; };
-               4086CB51063AB30000D4CD53 /* pnghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EB01FA022C0175ACA7 /* pnghand.cpp */; };
                4086CB52063AB30000D4CD53 /* printmac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EE01FA022C0175ACA7 /* printmac.cpp */; };
                4086CB53063AB30000D4CD53 /* radiobox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861EF01FA022C0175ACA7 /* radiobox.cpp */; };
                4086CB54063AB30000D4CD53 /* printdlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A861ED01FA022C0175ACA7 /* printdlg.cpp */; };
@@ -974,6 +960,12 @@
                40DCE35206C744C90000D83E /* gsocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40DCE34F06C744C90000D83E /* gsocket.cpp */; };
                40ECB13A074BD1D0005AAC48 /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECB139074BD1D0005AAC48 /* stdpaths.cpp */; };
                40ECB13C074BD1D0005AAC48 /* stdpaths.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECB139074BD1D0005AAC48 /* stdpaths.cpp */; };
+               40F0173A0A30684000AC9076 /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017380A30683F00AC9076 /* colourcmn.cpp */; };
+               40F0173B0A30684000AC9076 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017390A30683F00AC9076 /* convauto.cpp */; };
+               40F0173C0A30684000AC9076 /* colourcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017380A30683F00AC9076 /* colourcmn.cpp */; };
+               40F0173D0A30684000AC9076 /* convauto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017390A30683F00AC9076 /* convauto.cpp */; };
+               40F017420A306C7600AC9076 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017410A306C7600AC9076 /* fontenumcmn.cpp */; };
+               40F017430A306C7600AC9076 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F017410A306C7600AC9076 /* fontenumcmn.cpp */; };
                40F10E5806AD0230003C7AC3 /* tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F10E5606AD0230003C7AC3 /* tglbtn.cpp */; };
                40F10E5906AD0230003C7AC3 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F10E5706AD0230003C7AC3 /* thread.cpp */; };
                40F10E5C06AD0230003C7AC3 /* tglbtn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40F10E5606AD0230003C7AC3 /* tglbtn.cpp */; };
@@ -1001,26 +993,6 @@
                };
 /* End PBXBuildRule section */
 
-/* Begin PBXBuildStyle section */
-               4F0BB7EC011F40E904CA0E50 /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               GCC_DYNAMIC_NO_PIC = NO;
-                               GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                               ZERO_LINK = YES;
-                       };
-                       name = Development;
-               };
-               4F0BB7ED011F40E904CA0E50 /* Deployment */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               GCC_ENABLE_FIX_AND_CONTINUE = NO;
-                               ZERO_LINK = NO;
-                       };
-                       name = Deployment;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
                4086D202063BC05E00D4CD53 /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -1152,6 +1124,9 @@
                40CDE8D9098250AB00E8156D /* evtloop.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = evtloop.cpp; sourceTree = "<group>"; };
                40DCE34F06C744C90000D83E /* gsocket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gsocket.cpp; sourceTree = "<group>"; };
                40ECB139074BD1D0005AAC48 /* stdpaths.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = stdpaths.cpp; sourceTree = "<group>"; };
+               40F017380A30683F00AC9076 /* colourcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = colourcmn.cpp; sourceTree = "<group>"; };
+               40F017390A30683F00AC9076 /* convauto.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = convauto.cpp; sourceTree = "<group>"; };
+               40F017410A306C7600AC9076 /* fontenumcmn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fontenumcmn.cpp; sourceTree = "<group>"; };
                40F10E5606AD0230003C7AC3 /* tglbtn.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tglbtn.cpp; sourceTree = "<group>"; };
                40F10E5706AD0230003C7AC3 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = thread.cpp; sourceTree = "<group>"; };
                40FF2B0C0869B1530013E961 /* webkit.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = webkit.mm; path = htmlctrl/webkit/webkit.mm; sourceTree = "<group>"; };
@@ -1810,7 +1785,6 @@
                F5A861E801FA022C0175ACA7 /* notebmac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = notebmac.cpp; sourceTree = "<group>"; };
                F5A861E901FA022C0175ACA7 /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
                F5A861EA01FA022C0175ACA7 /* pen.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = pen.cpp; sourceTree = "<group>"; };
-               F5A861EB01FA022C0175ACA7 /* pnghand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = pnghand.cpp; sourceTree = "<group>"; };
                F5A861ED01FA022C0175ACA7 /* printdlg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = printdlg.cpp; sourceTree = "<group>"; };
                F5A861EE01FA022C0175ACA7 /* printmac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = printmac.cpp; sourceTree = "<group>"; };
                F5A861EF01FA022C0175ACA7 /* radiobox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = radiobox.cpp; sourceTree = "<group>"; };
@@ -2511,8 +2485,10 @@
                                F5A85FE501FA022B0175ACA7 /* cmdline.cpp */,
                                F5A85FE601FA022B0175ACA7 /* cmdproc.cpp */,
                                F5A85FE701FA022B0175ACA7 /* cmndata.cpp */,
+                               40F017380A30683F00AC9076 /* colourcmn.cpp */,
                                F5A85FE801FA022B0175ACA7 /* config.cpp */,
                                F5A85FE901FA022B0175ACA7 /* containr.cpp */,
+                               40F017390A30683F00AC9076 /* convauto.cpp */,
                                F5A85FEA01FA022B0175ACA7 /* cshelp.cpp */,
                                F5A85FEB01FA022B0175ACA7 /* ctrlcmn.cpp */,
                                F5A85FEC01FA022B0175ACA7 /* ctrlsub.cpp */,
@@ -2551,6 +2527,7 @@
                                CA60175C04D43A8100000080 /* fldlgcmn.cpp */,
                                CA60175D04D43A8100000080 /* fmapbase.cpp */,
                                F5A8600D01FA022B0175ACA7 /* fontcmn.cpp */,
+                               40F017410A306C7600AC9076 /* fontenumcmn.cpp */,
                                F5A8600E01FA022B0175ACA7 /* fontmap.cpp */,
                                F5A8600F01FA022B0175ACA7 /* framecmn.cpp */,
                                F5A8601001FA022B0175ACA7 /* fs_inet.cpp */,
@@ -2850,7 +2827,6 @@
                                F5A861E801FA022C0175ACA7 /* notebmac.cpp */,
                                F5A861E901FA022C0175ACA7 /* palette.cpp */,
                                F5A861EA01FA022C0175ACA7 /* pen.cpp */,
-                               F5A861EB01FA022C0175ACA7 /* pnghand.cpp */,
                                F5A861ED01FA022C0175ACA7 /* printdlg.cpp */,
                                F5A861EE01FA022C0175ACA7 /* printmac.cpp */,
                                F5A861EF01FA022C0175ACA7 /* radiobox.cpp */,
@@ -3021,58 +2997,6 @@
                        buildRules = (
                                40EEBF1E08BE1E8B000BD0A5 /* PBXBuildRule */,
                        );
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 2.6;
-                               DYLIB_CURRENT_VERSION = 2.6.0;
-                               GCC_INPUT_FILETYPE = automatic;
-                               GCC_OPTIMIZATION_LEVEL = s;
-                               GCC_PFE_FILE_C_DIALECTS = "c++";
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               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",
-                                       MACOS_CLASSIC,
-                               );
-                               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,
-                                       expat/lib,
-                                       tiff,
-                                       "-",
-                                       "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon",
-                                       /usr/include,
-                               );
-                               LIBRARY_STYLE = STATIC;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
-                               OTHER_LIBTOOL_FLAGS = "";
-                               OTHER_REZFLAGS = "-d __UNIX__";
-                               PRODUCT_NAME = wx_macd;
-                               REZ_EXECUTABLE = NO;
-                               SECTORDER_FLAGS = "";
-                               USE_HEADERMAP = FALSE;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                        );
                        name = static;
@@ -3092,59 +3016,6 @@
                        );
                        buildRules = (
                        );
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                               DYLIB_COMPATIBILITY_VERSION = 2.6;
-                               DYLIB_CURRENT_VERSION = 2.6.0;
-                               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/wxprec.h;
-                               GCC_PREPROCESSOR_DEFINITIONS = (
-                                       NO_GCC_PRAGMA,
-                                       __WXDEBUG__,
-                                       WXMAKINGDLL,
-                                       __WXMAC__,
-                                       "wxUSE_BASE=1",
-                                       "_FILE_OFFSET_BITS=64",
-                                       _LARGE_FILES,
-                                       "__WXMAC_XCODE__=1",
-                                       MACOS_CLASSIC,
-                                       "WX_PRECOMP=1",
-                               );
-                               HEADER_SEARCH_PATHS = (
-                                       "${SYMROOT}/include",
-                                       ../include,
-                                       mac/carbon/morefilex,
-                                       common,
-                                       jpeg,
-                                       png,
-                                       expat/lib,
-                                       regex,
-                                       tiff,
-                                       "-",
-                                       "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon",
-                                       /usr/include,
-                               );
-                               INSTALL_PATH = "@executable_path/../Frameworks/";
-                               LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.1;
-                               LIBRARY_STYLE = DYNAMIC;
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "\U0001-flat_namespace";
-                               OTHER_LIBTOOL_FLAGS = "\U0001";
-                               OTHER_REZFLAGS = "-d __UNIX__";
-                               PRODUCT_NAME = libwx_macd;
-                               REZ_EXECUTABLE = NO;
-                               SECTORDER_FLAGS = "";
-                               USE_HEADERMAP = FALSE;
-                               WARNING_CFLAGS = (
-                                       "-Wmost",
-                                       "-Wno-four-char-constants",
-                                       "-Wno-unknown-pragmas",
-                               );
-                       };
                        dependencies = (
                        );
                        name = dynamic;
@@ -3158,14 +3029,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 18B5B99E08564B5D002803C9 /* Build configuration list for PBXProject "wxWindows" */;
-                       buildSettings = {
-                               MACOSX_DEPLOYMENT_TARGET = 10.4;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                       };
-                       buildStyles = (
-                               4F0BB7EC011F40E904CA0E50 /* Development */,
-                               4F0BB7ED011F40E904CA0E50 /* Deployment */,
-                       );
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* wxWindows */;
                        productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
@@ -3462,7 +3325,6 @@
                                4086C83B063AB2FF00D4CD53 /* notebmac.cpp in Sources */,
                                4086C83C063AB2FF00D4CD53 /* palette.cpp in Sources */,
                                4086C83D063AB2FF00D4CD53 /* pen.cpp in Sources */,
-                               4086C83E063AB2FF00D4CD53 /* pnghand.cpp in Sources */,
                                4086C83F063AB2FF00D4CD53 /* printmac.cpp in Sources */,
                                4086C840063AB2FF00D4CD53 /* radiobox.cpp in Sources */,
                                4086C841063AB2FF00D4CD53 /* printdlg.cpp in Sources */,
@@ -3691,6 +3553,9 @@
                                40CDE8DB098250AB00E8156D /* evtloop.cpp in Sources */,
                                43DFF5BA09926F7B0033000B /* helpdlg.cpp in Sources */,
                                43DFF5BB09926F7B0033000B /* helpwnd.cpp in Sources */,
+                               40F0173A0A30684000AC9076 /* colourcmn.cpp in Sources */,
+                               40F0173B0A30684000AC9076 /* convauto.cpp in Sources */,
+                               40F017420A306C7600AC9076 /* fontenumcmn.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3939,7 +3804,6 @@
                                4086CB4E063AB30000D4CD53 /* notebmac.cpp in Sources */,
                                4086CB4F063AB30000D4CD53 /* palette.cpp in Sources */,
                                4086CB50063AB30000D4CD53 /* pen.cpp in Sources */,
-                               4086CB51063AB30000D4CD53 /* pnghand.cpp in Sources */,
                                4086CB52063AB30000D4CD53 /* printmac.cpp in Sources */,
                                4086CB53063AB30000D4CD53 /* radiobox.cpp in Sources */,
                                4086CB54063AB30000D4CD53 /* printdlg.cpp in Sources */,
@@ -4168,6 +4032,9 @@
                                40CDE8DA098250AB00E8156D /* evtloop.cpp in Sources */,
                                43DFF5BC09926F7B0033000B /* helpdlg.cpp in Sources */,
                                43DFF5BD09926F7B0033000B /* helpwnd.cpp in Sources */,
+                               40F0173C0A30684000AC9076 /* colourcmn.cpp in Sources */,
+                               40F0173D0A30684000AC9076 /* convauto.cpp in Sources */,
+                               40F017430A306C7600AC9076 /* fontenumcmn.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };