X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8fa0dd3f2955b81e75b32ccf8a0be20d3f15adb3..810d800e3ca2da8c032766b548da9496cc102ff4:/src/wxWindows.xcode/project.pbxproj diff --git a/src/wxWindows.xcode/project.pbxproj b/src/wxWindows.xcode/project.pbxproj index 32878f5cc2..099d5d2b67 100644 --- a/src/wxWindows.xcode/project.pbxproj +++ b/src/wxWindows.xcode/project.pbxproj @@ -73,8 +73,7 @@ sourceTree = ""; }; 08FB77AAFE841565C02AAC07 = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; + isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; @@ -111,43 +110,51 @@ settings = { }; }; - 4086C3A2063A454900D4CD53 = { + 407A90F6065742ED00F01665 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; - path = sound.cpp; + path = spinctrl.cpp; refType = 4; sourceTree = ""; }; - 4086C58C063AA59200D4CD53 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = gsocket.c; - refType = 4; - sourceTree = ""; + 407A90F7065742ED00F01665 = { + fileRef = 407A90F6065742ED00F01665; + isa = PBXBuildFile; + settings = { + }; }; - 4086C59F063AA5C700D4CD53 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = glcanvas.cpp; - refType = 4; - sourceTree = ""; + 407A90F8065742ED00F01665 = { + fileRef = 407A90F6065742ED00F01665; + isa = PBXBuildFile; + settings = { + }; + }; + 407A90F9065742ED00F01665 = { + fileRef = 407A90F6065742ED00F01665; + isa = PBXBuildFile; + settings = { + }; + }; + 407A90FA065742ED00F01665 = { + fileRef = 407A90F6065742ED00F01665; + isa = PBXBuildFile; + settings = { + }; }; - 4086C5A0063AA5C700D4CD53 = { + 4086C3A2063A454900D4CD53 = { fileEncoding = 30; isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = gsockosx.c; + lastKnownFileType = sourcecode.cpp.cpp; + path = sound.cpp; refType = 4; sourceTree = ""; }; - 4086C5A1063AA5C700D4CD53 = { + 4086C59F063AA5C700D4CD53 = { fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; - path = mpthread.cpp; + path = glcanvas.cpp; refType = 4; sourceTree = ""; }; @@ -198,6 +205,7 @@ 4086C742063AB2FF00D4CD53 = { buildPhases = ( 4086C743063AB2FF00D4CD53, + 409E9DD5065140690091DE7E, 4086C744063AB2FF00D4CD53, 4086C746063AB2FF00D4CD53, 4086C8C8063AB2FF00D4CD53, @@ -209,11 +217,13 @@ DYLIB_COMPATIBILITY_VERSION = 2.5; DYLIB_CURRENT_VERSION = 2.5.0; GCC_INPUT_FILETYPE = automatic; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 1; 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"; + 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_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 +257,6 @@ buildActionMask = 2147483647; files = ( 4086C745063AB2FF00D4CD53, - 4086D2E3063C207900D4CD53, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -413,7 +422,6 @@ 4086C7DC063AB2FF00D4CD53, 4086C7DD063AB2FF00D4CD53, 4086C7DE063AB2FF00D4CD53, - 4086C7DF063AB2FF00D4CD53, 4086C7E0063AB2FF00D4CD53, 4086C7E1063AB2FF00D4CD53, 4086C7E2063AB2FF00D4CD53, @@ -638,14 +646,16 @@ 4086C8BD063AB2FF00D4CD53, 4086C8BE063AB2FF00D4CD53, 4086C8BF063AB2FF00D4CD53, - 4086C8C0063AB2FF00D4CD53, 4086C8C1063AB2FF00D4CD53, - 4086C8C2063AB2FF00D4CD53, - 4086C8C3063AB2FF00D4CD53, 4086C8C4063AB2FF00D4CD53, 4086C8C5063AB2FF00D4CD53, 4086C8C6063AB2FF00D4CD53, 4086C8C7063AB2FF00D4CD53, + 407A90FA065742ED00F01665, + 40F10E5806AD0230003C7AC3, + 40F10E5906AD0230003C7AC3, + 40DCE34406C744100000D83E, + 40DCE35006C744C90000D83E, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -1562,12 +1572,6 @@ settings = { }; }; - 4086C7DF063AB2FF00D4CD53 = { - fileRef = F5A8609601FA022C0175ACA7; - isa = PBXBuildFile; - settings = { - }; - }; 4086C7E0063AB2FF00D4CD53 = { fileRef = F5A8609501FA022C0175ACA7; isa = PBXBuildFile; @@ -2912,30 +2916,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; @@ -2999,8 +2985,8 @@ 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"; + 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 = ""; @@ -3266,7 +3252,6 @@ 4086C9AE063AB30000D4CD53, 4086C9AF063AB30000D4CD53, 4086C9B0063AB30000D4CD53, - 4086C9B1063AB30000D4CD53, 4086C9B2063AB30000D4CD53, 4086C9B3063AB30000D4CD53, 4086C9B4063AB30000D4CD53, @@ -3418,14 +3403,16 @@ 4086CA46063AB30000D4CD53, 4086CA47063AB30000D4CD53, 4086CA48063AB30000D4CD53, - 4086CA49063AB30000D4CD53, 4086CA4A063AB30000D4CD53, - 4086CA4B063AB30000D4CD53, - 4086CA4C063AB30000D4CD53, 4086CA4D063AB30000D4CD53, 4086CA4E063AB30000D4CD53, 4086CA4F063AB30000D4CD53, 4086CA50063AB30000D4CD53, + 407A90F9065742ED00F01665, + 40F10E5A06AD0230003C7AC3, + 40F10E5B06AD0230003C7AC3, + 40DCE34506C744100000D83E, + 40DCE35106C744C90000D83E, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -4780,12 +4767,6 @@ settings = { }; }; - 4086C9B1063AB30000D4CD53 = { - fileRef = F5A8609601FA022C0175ACA7; - isa = PBXBuildFile; - settings = { - }; - }; 4086C9B2063AB30000D4CD53 = { fileRef = F5A8609501FA022C0175ACA7; isa = PBXBuildFile; @@ -5692,30 +5673,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; @@ -5775,12 +5738,15 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 2.5; DYLIB_CURRENT_VERSION = 2.5.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_xcode.h; - GCC_PREPROCESSOR_DEFINITIONS = "NO_GCC_PRAGMA __WXDEBUG__ WXMAKINGDLL __WXMAC__ wxUSE_BASE=1 _FILE_OFFSET_BITS=64 _LARGE_FILES"; + 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; LIBRARY_STYLE = DYNAMIC; OTHER_CFLAGS = ""; @@ -5979,7 +5945,6 @@ 4086CAEF063AB30000D4CD53, 4086CAF0063AB30000D4CD53, 4086CAF1063AB30000D4CD53, - 4086CAF2063AB30000D4CD53, 4086CAF3063AB30000D4CD53, 4086CAF4063AB30000D4CD53, 4086CAF5063AB30000D4CD53, @@ -6204,14 +6169,16 @@ 4086CBD0063AB30000D4CD53, 4086CBD1063AB30000D4CD53, 4086CBD2063AB30000D4CD53, - 4086CBD3063AB30000D4CD53, 4086CBD4063AB30000D4CD53, - 4086CBD5063AB30000D4CD53, - 4086CBD6063AB30000D4CD53, 4086CBD7063AB30000D4CD53, 4086CBD8063AB30000D4CD53, 4086CBD9063AB30000D4CD53, 4086CBDA063AB30000D4CD53, + 407A90F7065742ED00F01665, + 40F10E5C06AD0230003C7AC3, + 40F10E5D06AD0230003C7AC3, + 40DCE34606C744100000D83E, + 40DCE35206C744C90000D83E, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -7128,12 +7095,6 @@ settings = { }; }; - 4086CAF2063AB30000D4CD53 = { - fileRef = F5A8609601FA022C0175ACA7; - isa = PBXBuildFile; - settings = { - }; - }; 4086CAF3063AB30000D4CD53 = { fileRef = F5A8609501FA022C0175ACA7; isa = PBXBuildFile; @@ -8478,30 +8439,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; @@ -8587,8 +8530,8 @@ 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"; + 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 = ""; @@ -8854,7 +8797,6 @@ 4086CCC4063AB30000D4CD53, 4086CCC5063AB30000D4CD53, 4086CCC6063AB30000D4CD53, - 4086CCC7063AB30000D4CD53, 4086CCC8063AB30000D4CD53, 4086CCC9063AB30000D4CD53, 4086CCCA063AB30000D4CD53, @@ -9006,14 +8948,16 @@ 4086CD5C063AB30000D4CD53, 4086CD5D063AB30000D4CD53, 4086CD5E063AB30000D4CD53, - 4086CD5F063AB30000D4CD53, 4086CD60063AB30000D4CD53, - 4086CD61063AB30000D4CD53, - 4086CD62063AB30000D4CD53, 4086CD63063AB30000D4CD53, 4086CD64063AB30000D4CD53, 4086CD65063AB30000D4CD53, 4086CD66063AB30000D4CD53, + 407A90F8065742ED00F01665, + 40F10E5E06AD0230003C7AC3, + 40F10E5F06AD0230003C7AC3, + 40DCE34706C744100000D83E, + 40DCE35306C744C90000D83E, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -10368,12 +10312,6 @@ settings = { }; }; - 4086CCC7063AB30000D4CD53 = { - fileRef = F5A8609601FA022C0175ACA7; - isa = PBXBuildFile; - settings = { - }; - }; 4086CCC8063AB30000D4CD53 = { fileRef = F5A8609501FA022C0175ACA7; isa = PBXBuildFile; @@ -11280,30 +11218,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; @@ -11441,17 +11361,139 @@ target = 4086CBE2063AB30000D4CD53; targetProxy = 4086D208063BC05E00D4CD53; }; - 4086D2E2063C207900D4CD53 = { + 409E9DD5065140690091DE7E = { + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 40DCE34306C744100000D83E = { fileEncoding = 30; isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = wx_xcode.h; - path = /Users/cs/.Trash/wx_xcode.h; - refType = 0; - sourceTree = ""; + lastKnownFileType = sourcecode.cpp.cpp; + path = gsockosx.cpp; + refType = 4; + sourceTree = ""; + }; + 40DCE34406C744100000D83E = { + fileRef = 40DCE34306C744100000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE34506C744100000D83E = { + fileRef = 40DCE34306C744100000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE34606C744100000D83E = { + fileRef = 40DCE34306C744100000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE34706C744100000D83E = { + fileRef = 40DCE34306C744100000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE34F06C744C90000D83E = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + path = gsocket.cpp; + refType = 4; + sourceTree = ""; + }; + 40DCE35006C744C90000D83E = { + fileRef = 40DCE34F06C744C90000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE35106C744C90000D83E = { + fileRef = 40DCE34F06C744C90000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE35206C744C90000D83E = { + fileRef = 40DCE34F06C744C90000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40DCE35306C744C90000D83E = { + fileRef = 40DCE34F06C744C90000D83E; + isa = PBXBuildFile; + settings = { + }; + }; + 40F10E5606AD0230003C7AC3 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + path = tglbtn.cpp; + refType = 4; + sourceTree = ""; + }; + 40F10E5706AD0230003C7AC3 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.cpp.cpp; + path = thread.cpp; + refType = 4; + sourceTree = ""; + }; + 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 = { + }; + }; + 40F10E5D06AD0230003C7AC3 = { + fileRef = 40F10E5706AD0230003C7AC3; + isa = PBXBuildFile; + settings = { + }; + }; + 40F10E5E06AD0230003C7AC3 = { + fileRef = 40F10E5606AD0230003C7AC3; + isa = PBXBuildFile; + settings = { + }; }; - 4086D2E3063C207900D4CD53 = { - fileRef = 4086D2E2063C207900D4CD53; + 40F10E5F06AD0230003C7AC3 = { + fileRef = 40F10E5706AD0230003C7AC3; isa = PBXBuildFile; settings = { }; @@ -11467,23 +11509,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; @@ -11732,7 +11768,6 @@ }; F5A85C1A01FA022A0175ACA7 = { children = ( - 4086D2E2063C207900D4CD53, F5A85C1C01FA022A0175ACA7, F5FD822102CCECE601000133, ); @@ -11785,7 +11820,6 @@ F5A85C4401FA022A0175ACA7, F5A85C4501FA022A0175ACA7, F5A85C4601FA022A0175ACA7, - F5CC83DF0379C20901000133, F5A85C4701FA022A0175ACA7, F5A85C4801FA022A0175ACA7, F5A85C4901FA022A0175ACA7, @@ -11799,7 +11833,6 @@ F5A85C5101FA022A0175ACA7, F5A85C5201FA022A0175ACA7, F5A85C5301FA022A0175ACA7, - F5CC83E00379C20901000133, F5A85C5401FA022A0175ACA7, F5A85C5501FA022A0175ACA7, F5A85C5601FA022A0175ACA7, @@ -11812,7 +11845,6 @@ F5A85C5D01FA022A0175ACA7, F5A85C5E01FA022A0175ACA7, F5A85C6001FA022A0175ACA7, - F5CC83E10379C20901000133, F5A85C6101FA022A0175ACA7, F5A85C6201FA022A0175ACA7, F5A85C6301FA022A0175ACA7, @@ -11840,14 +11872,12 @@ F5A85CB301FA022A0175ACA7, F5A85CB401FA022A0175ACA7, F5A85CF901FA022B0175ACA7, - F5CC83E20379C20901000133, F5A85CFA01FA022B0175ACA7, F5A85CFB01FA022B0175ACA7, F5A85CFC01FA022B0175ACA7, F5A85CFD01FA022B0175ACA7, F5A85CFF01FA022B0175ACA7, F5A85D2101FA022B0175ACA7, - F5CC83E30379C20901000133, F5A85D2201FA022B0175ACA7, F5A85D2301FA022B0175ACA7, F5A85D2401FA022B0175ACA7, @@ -11861,7 +11891,6 @@ F5A85D2C01FA022B0175ACA7, F5A85D2D01FA022B0175ACA7, F5A85D2E01FA022B0175ACA7, - F5CC83E40379C20901000133, F5A85D2F01FA022B0175ACA7, F5A85D3001FA022B0175ACA7, F5A85D3101FA022B0175ACA7, @@ -11869,7 +11898,6 @@ F5A85D3301FA022B0175ACA7, F5A85D3401FA022B0175ACA7, F5A85D3501FA022B0175ACA7, - F5CC83E50379C20901000133, F5A85D3601FA022B0175ACA7, F5A85D3701FA022B0175ACA7, F5A8703A01FA0B7F0175ACA7, @@ -11888,7 +11916,6 @@ F5A85DAE01FA022B0175ACA7, F5A85DAF01FA022B0175ACA7, F5A85DF101FA022B0175ACA7, - F5CC83E60379C20901000133, F5A85DF201FA022B0175ACA7, F5A85E9701FA022B0175ACA7, F5A85E9801FA022B0175ACA7, @@ -11905,7 +11932,6 @@ F5A85F0901FA022B0175ACA7, F5A85F0A01FA022B0175ACA7, F5A85F0E01FA022B0175ACA7, - F5CC83E70379C20901000133, F5A85F1401FA022B0175ACA7, F5A85F1501FA022B0175ACA7, F5A85F1601FA022B0175ACA7, @@ -11929,9 +11955,9 @@ F5A85F2B01FA022B0175ACA7, F5A85F2C01FA022B0175ACA7, F5A85F2D01FA022B0175ACA7, + F5A85F3001FA022B0175ACA7, F5A85F2E01FA022B0175ACA7, F5A85F2F01FA022B0175ACA7, - F5A85F3001FA022B0175ACA7, F5A85F3101FA022B0175ACA7, F5A85F3201FA022B0175ACA7, F5A85F3301FA022B0175ACA7, @@ -11940,7 +11966,6 @@ F5A85F3601FA022B0175ACA7, F5A85F3701FA022B0175ACA7, F5A85F3801FA022B0175ACA7, - F5A85F3901FA022B0175ACA7, F5A85F3A01FA022B0175ACA7, F5A85F3B01FA022B0175ACA7, F5A85F3C01FA022B0175ACA7, @@ -12675,12 +12700,8 @@ F5A85C8801FA022A0175ACA7, F5A85C8901FA022A0175ACA7, F5A85C8A01FA022A0175ACA7, - F5A85C8B01FA022A0175ACA7, F5A85C8C01FA022A0175ACA7, F5A85C8D01FA022A0175ACA7, - F5A85C8E01FA022A0175ACA7, - F5A85C8F01FA022A0175ACA7, - F5A85C9001FA022A0175ACA7, F5A85C9201FA022A0175ACA7, F5A85C9401FA022A0175ACA7, F5A85C9501FA022A0175ACA7, @@ -12701,7 +12722,6 @@ F5A85CA801FA022A0175ACA7, F5A85CA901FA022A0175ACA7, F5A85CAC01FA022A0175ACA7, - F5A85CAD01FA022A0175ACA7, F5A85CAF01FA022A0175ACA7, ); isa = PBXGroup; @@ -12821,14 +12841,6 @@ refType = 4; sourceTree = ""; }; - F5A85C8B01FA022A0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = gridg.h; - refType = 4; - sourceTree = ""; - }; F5A85C8C01FA022A0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -12845,30 +12857,6 @@ refType = 4; sourceTree = ""; }; - F5A85C8E01FA022A0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = helphtml.h; - refType = 4; - sourceTree = ""; - }; - F5A85C8F01FA022A0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = helpwxht.h; - refType = 4; - sourceTree = ""; - }; - F5A85C9001FA022A0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = helpxlp.h; - refType = 4; - sourceTree = ""; - }; F5A85C9201FA022A0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -13029,14 +13017,6 @@ refType = 4; sourceTree = ""; }; - F5A85CAD01FA022A0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = treelay.h; - refType = 4; - sourceTree = ""; - }; F5A85CAF01FA022A0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -13539,7 +13519,6 @@ F5A85D8901FA022B0175ACA7, F5A85D8A01FA022B0175ACA7, F5A85D8B01FA022B0175ACA7, - F5A85D8C01FA022B0175ACA7, F5A85D8D01FA022B0175ACA7, ); isa = PBXGroup; @@ -14163,14 +14142,6 @@ refType = 4; sourceTree = ""; }; - F5A85D8C01FA022B0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = wave.h; - refType = 4; - sourceTree = ""; - }; F5A85D8D01FA022B0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -14711,14 +14682,6 @@ refType = 4; sourceTree = ""; }; - F5A85F3901FA022B0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - path = tbarsmpl.h; - refType = 4; - sourceTree = ""; - }; F5A85F3A01FA022B0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -16315,7 +16278,6 @@ F5A8609401FA022C0175ACA7, F5A8609501FA022C0175ACA7, CA60176D04D43CAA00000080, - F5A8609601FA022C0175ACA7, F5A8609701FA022C0175ACA7, F5A8609801FA022C0175ACA7, F5A8609A01FA022C0175ACA7, @@ -16547,14 +16509,6 @@ refType = 4; sourceTree = ""; }; - F5A8609601FA022C0175ACA7 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.cpp.cpp; - path = spinctlg.cpp; - refType = 4; - sourceTree = ""; - }; F5A8609701FA022C0175ACA7 = { fileEncoding = 30; isa = PBXFileReference; @@ -17267,7 +17221,7 @@ F5A861BF01FA022C0175ACA7, F5A861C001FA022C0175ACA7, F5A861C101FA022C0175ACA7, - 4086C5A0063AA5C700D4CD53, + 40DCE34306C744100000D83E, 4086C59F063AA5C700D4CD53, F5A861C501FA022C0175ACA7, F5A861C601FA022C0175ACA7, @@ -17297,6 +17251,7 @@ F5A861F401FA022C0175ACA7, 4086C3A2063A454900D4CD53, F5A861F501FA022C0175ACA7, + 407A90F6065742ED00F01665, F5A861F701FA022C0175ACA7, F5A861F801FA022C0175ACA7, F5A861F901FA022C0175ACA7, @@ -17304,7 +17259,8 @@ F5A861FC01FA022C0175ACA7, F5A861FD01FA022C0175ACA7, F5A861FF01FA022C0175ACA7, - 4086C5A1063AA5C700D4CD53, + 40F10E5606AD0230003C7AC3, + 40F10E5706AD0230003C7AC3, F5A8620101FA022C0175ACA7, F5A8620201FA022C0175ACA7, F5A8620301FA022C0175ACA7, @@ -18460,7 +18416,7 @@ F5A8648A01FA022D0175ACA7 = { children = ( CA60177204D43D2300000080, - 4086C58C063AA59200D4CD53, + 40DCE34F06C744C90000D83E, F5A8649201FA022D0175ACA7, F5A8649401FA022D0175ACA7, ); @@ -18519,8 +18475,7 @@ sourceTree = ""; }; F5C5D3DF01FA2D0A01D0F0BA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; + isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; @@ -18543,87 +18498,6 @@ refType = 4; sourceTree = ""; }; - F5CC83DF0379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = dcbuffer.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/dcbuffer.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E00379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = display.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/display.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E10379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = features.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/features.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E20379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = hashmap.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/hashmap.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E30379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = iconbndl.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/iconbndl.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E40379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = ipc.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/ipc.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E50379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = listbase.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/listbase.h; - refType = 0; - sourceTree = ""; - }; - F5CC83E60379C20901000133 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = file; - name = msgout.h; - path = /Volumes/Users/gilles/cvs/wxWindows/include/wx/msgout.h; - refType = 0; - sourceTree = ""; - }; - 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 = ""; - }; F5CC83E80379C20901000133 = { fileEncoding = 30; isa = PBXFileReference;