define WM_CONTEXTMENU if the standard headers don't

[wxWidgets.git] / src / wxWindows.xcode / project.pbxproj

diff --git a/src/wxWindows.xcode/project.pbxproj b/src/wxWindows.xcode/project.pbxproj
index 303e500d076e1386c0ebe5b3dca8adfd6079f538..6963ddaebd501b853164fcec3d1e1d008340b18e 100644 (file)
--- a/src/wxWindows.xcode/project.pbxproj
+++ b/src/wxWindows.xcode/project.pbxproj
@@ -91,38 +91,6 @@
 //0A2
 //0A3
 //0A4
 //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;
                0A98CB6A07146A06007B4289 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -253,6 +221,38 @@
 //402
 //403
 //404
 //402
 //403
 //404

+               401640E507F94B2800A8837A = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = imaglist.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               401640E607F94B2800A8837A = {
+                       fileRef = 401640E507F94B2800A8837A;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               401640E707F94B2800A8837A = {
+                       fileRef = 401640E507F94B2800A8837A;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               401640E807F94B2800A8837A = {
+                       fileRef = 401640E507F94B2800A8837A;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               401640E907F94B2800A8837A = {
+                       fileRef = 401640E507F94B2800A8837A;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };

                405DD167063C2BFC00F579EE = {
                        isa = PBXFileReference;
                        lastKnownFileType = "compiled.mach-o.dylib";
                405DD167063C2BFC00F579EE = {
                        isa = PBXFileReference;
                        lastKnownFileType = "compiled.mach-o.dylib";


@@ -273,6 +273,313 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

+               40607C1407493C3F00DC0420 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = archive.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               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.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 = (
+                               40AF90B307C8A9CF006A6D3C,
+                               40AF90B407C8A9CF006A6D3C,
+                               40607C740749432A00DC0420,
+                               40607C750749432A00DC0420,
+                               40670A8207377A6300F7C08C,
+                               40670A8307377A6300F7C08C,
+                       );
+                       isa = PBXGroup;
+                       name = mac/corefoundation;
+                       path = mac/carbon;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40670A8207377A6300F7C08C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.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>";
+               };
+               40670A9407377B1000F7C08C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       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;
                407A90F6065742ED00F01665 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -380,12 +687,13 @@
                                DYLIB_COMPATIBILITY_VERSION = 2.5;
                                DYLIB_CURRENT_VERSION = 2.5.3;
                                GCC_INPUT_FILETYPE = automatic;
                                DYLIB_COMPATIBILITY_VERSION = 2.5;
                                DYLIB_CURRENT_VERSION = 2.5.3;
                                GCC_INPUT_FILETYPE = automatic;

-                               GCC_OPTIMIZATION_LEVEL = 1;
+                               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";
                                GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
                                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";
                                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;
                                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;


@@ -539,7 +847,6 @@
                                4086C7AE063AB2FF00D4CD53,
                                4086C7AF063AB2FF00D4CD53,
                                4086C7B0063AB2FF00D4CD53,
                                4086C7AE063AB2FF00D4CD53,
                                4086C7AF063AB2FF00D4CD53,
                                4086C7B0063AB2FF00D4CD53,

-                               4086C7B1063AB2FF00D4CD53,

                                4086C7B2063AB2FF00D4CD53,
                                4086C7B3063AB2FF00D4CD53,
                                4086C7B4063AB2FF00D4CD53,
                                4086C7B2063AB2FF00D4CD53,
                                4086C7B3063AB2FF00D4CD53,
                                4086C7B4063AB2FF00D4CD53,


@@ -567,11 +874,9 @@
                                4086C7CA063AB2FF00D4CD53,
                                4086C7CB063AB2FF00D4CD53,
                                4086C7CC063AB2FF00D4CD53,
                                4086C7CA063AB2FF00D4CD53,
                                4086C7CB063AB2FF00D4CD53,
                                4086C7CC063AB2FF00D4CD53,

-                               4086C7CD063AB2FF00D4CD53,

                                4086C7CE063AB2FF00D4CD53,
                                4086C7CF063AB2FF00D4CD53,
                                4086C7D0063AB2FF00D4CD53,
                                4086C7CE063AB2FF00D4CD53,
                                4086C7CF063AB2FF00D4CD53,
                                4086C7D0063AB2FF00D4CD53,

-                               4086C7D1063AB2FF00D4CD53,

                                4086C7D2063AB2FF00D4CD53,
                                4086C7D3063AB2FF00D4CD53,
                                4086C7D4063AB2FF00D4CD53,
                                4086C7D2063AB2FF00D4CD53,
                                4086C7D3063AB2FF00D4CD53,
                                4086C7D4063AB2FF00D4CD53,


@@ -665,7 +970,6 @@
                                4086C82D063AB2FF00D4CD53,
                                4086C82E063AB2FF00D4CD53,
                                4086C82F063AB2FF00D4CD53,
                                4086C82D063AB2FF00D4CD53,
                                4086C82E063AB2FF00D4CD53,
                                4086C82F063AB2FF00D4CD53,

-                               4086C830063AB2FF00D4CD53,

                                4086C831063AB2FF00D4CD53,
                                4086C832063AB2FF00D4CD53,
                                4086C833063AB2FF00D4CD53,
                                4086C831063AB2FF00D4CD53,
                                4086C832063AB2FF00D4CD53,
                                4086C833063AB2FF00D4CD53,


@@ -725,7 +1029,6 @@
                                4086C869063AB2FF00D4CD53,
                                4086C86A063AB2FF00D4CD53,
                                4086C86B063AB2FF00D4CD53,
                                4086C869063AB2FF00D4CD53,
                                4086C86A063AB2FF00D4CD53,
                                4086C86B063AB2FF00D4CD53,

-                               4086C86C063AB2FF00D4CD53,

                                4086C86D063AB2FF00D4CD53,
                                4086C86E063AB2FF00D4CD53,
                                4086C86F063AB2FF00D4CD53,
                                4086C86D063AB2FF00D4CD53,
                                4086C86E063AB2FF00D4CD53,
                                4086C86F063AB2FF00D4CD53,


@@ -817,12 +1120,39 @@
                                407A90FA065742ED00F01665,
                                40F10E5806AD0230003C7AC3,
                                40F10E5906AD0230003C7AC3,
                                407A90FA065742ED00F01665,
                                40F10E5806AD0230003C7AC3,
                                40F10E5906AD0230003C7AC3,

-                               40DCE34406C744100000D83E,

                                40DCE35006C744C90000D83E,
                                40DCE35006C744C90000D83E,

-                               0A98CB560714687E007B4289,

                                0A98CB6B07146A06007B4289,
                                0A98CC480715CFBC007B4289,
                                0A98CC4C0715D03E007B4289,
                                0A98CB6B07146A06007B4289,
                                0A98CC480715CFBC007B4289,
                                0A98CC4C0715D03E007B4289,

+                               40670A8407377A6400F7C08C,
+                               40670A8507377A6400F7C08C,
+                               40670A9707377B1000F7C08C,
+                               40670A9807377B1000F7C08C,
+                               40670A9907377B1000F7C08C,
+                               40670A9A07377B1000F7C08C,
+                               40607C1607493C3F00DC0420,
+                               40607C760749432A00DC0420,
+                               40607C770749432A00DC0420,
+                               40ECB13A074BD1D0005AAC48,
+                               40AF909107C8A926006A6D3C,
+                               40AF909B07C8A976006A6D3C,
+                               40AF909C07C8A976006A6D3C,
+                               40AF909D07C8A976006A6D3C,
+                               40AF909F07C8A976006A6D3C,
+                               40AF90A007C8A976006A6D3C,
+                               40AF90B507C8A9CF006A6D3C,
+                               40AF90B607C8A9CF006A6D3C,
+                               40AF90BE07C8AA08006A6D3C,
+                               40AF90C307C8AA17006A6D3C,
+                               40AF90E907C8B18C006A6D3C,
+                               40AF90EB07C8B18C006A6D3C,
+                               40AF90EC07C8B18C006A6D3C,
+                               40AF90ED07C8B18C006A6D3C,
+                               40AF90EF07C8B18C006A6D3C,
+                               40AF913607C8BD1F006A6D3C,
+                               40AF915207C8C912006A6D3C,
+                               40AF915307C8C912006A6D3C,
+                               401640E907F94B2800A8837A,

                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;


@@ -1463,12 +1793,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C7B1063AB2FF00D4CD53 = {
-                       fileRef = F5A8605B01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C7B2063AB2FF00D4CD53 = {
                        fileRef = F5A8605E01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C7B2063AB2FF00D4CD53 = {
                        fileRef = F5A8605E01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -1631,14 +1955,8 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C7CD063AB2FF00D4CD53 = {
-                       fileRef = F5A8608901FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               4086C7CE063AB2FF00D4CD53 = {
-                       fileRef = F5A8608801FA022C0175ACA7;
+               4086C7CE063AB2FF00D4CD53 = {
+                       fileRef = F5A8608801FA022C0175ACA7;

                        isa = PBXBuildFile;
                        settings = {
                        };
                        isa = PBXBuildFile;
                        settings = {
                        };


@@ -1655,12 +1973,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C7D1063AB2FF00D4CD53 = {
-                       fileRef = F5A8608501FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C7D2063AB2FF00D4CD53 = {
                        fileRef = F5A8608101FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C7D2063AB2FF00D4CD53 = {
                        fileRef = F5A8608101FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -2219,12 +2531,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C830063AB2FF00D4CD53 = {
-                       fileRef = F5A861AA01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C831063AB2FF00D4CD53 = {
                        fileRef = F5A861AB01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C831063AB2FF00D4CD53 = {
                        fileRef = F5A861AB01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -2579,12 +2885,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C86C063AB2FF00D4CD53 = {
-                       fileRef = F5A861C601FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C86D063AB2FF00D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C86D063AB2FF00D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -3314,7 +3614,6 @@
                                4086C944063AB30000D4CD53,
                                4086C945063AB30000D4CD53,
                                4086C946063AB30000D4CD53,
                                4086C944063AB30000D4CD53,
                                4086C945063AB30000D4CD53,
                                4086C946063AB30000D4CD53,

-                               4086C947063AB30000D4CD53,

                                4086C948063AB30000D4CD53,
                                4086C949063AB30000D4CD53,
                                4086C94A063AB30000D4CD53,
                                4086C948063AB30000D4CD53,
                                4086C949063AB30000D4CD53,
                                4086C94A063AB30000D4CD53,


@@ -3401,11 +3700,9 @@
                                4086C99B063AB30000D4CD53,
                                4086C99C063AB30000D4CD53,
                                4086C99D063AB30000D4CD53,
                                4086C99B063AB30000D4CD53,
                                4086C99C063AB30000D4CD53,
                                4086C99D063AB30000D4CD53,

-                               4086C99E063AB30000D4CD53,

                                4086C99F063AB30000D4CD53,
                                4086C9A0063AB30000D4CD53,
                                4086C9A1063AB30000D4CD53,
                                4086C99F063AB30000D4CD53,
                                4086C9A0063AB30000D4CD53,
                                4086C9A1063AB30000D4CD53,

-                               4086C9A2063AB30000D4CD53,

                                4086C9A3063AB30000D4CD53,
                                4086C9A4063AB30000D4CD53,
                                4086C9A5063AB30000D4CD53,
                                4086C9A3063AB30000D4CD53,
                                4086C9A4063AB30000D4CD53,
                                4086C9A5063AB30000D4CD53,


@@ -3508,7 +3805,6 @@
                                4086CA07063AB30000D4CD53,
                                4086CA08063AB30000D4CD53,
                                4086CA09063AB30000D4CD53,
                                4086CA07063AB30000D4CD53,
                                4086CA08063AB30000D4CD53,
                                4086CA09063AB30000D4CD53,

-                               4086CA0A063AB30000D4CD53,

                                4086CA0B063AB30000D4CD53,
                                4086CA0C063AB30000D4CD53,
                                4086CA0D063AB30000D4CD53,
                                4086CA0B063AB30000D4CD53,
                                4086CA0C063AB30000D4CD53,
                                4086CA0D063AB30000D4CD53,


@@ -3531,7 +3827,6 @@
                                4086CA1E063AB30000D4CD53,
                                4086CA1F063AB30000D4CD53,
                                4086CA20063AB30000D4CD53,
                                4086CA1E063AB30000D4CD53,
                                4086CA1F063AB30000D4CD53,
                                4086CA20063AB30000D4CD53,

-                               4086CA21063AB30000D4CD53,

                                4086CA22063AB30000D4CD53,
                                4086CA23063AB30000D4CD53,
                                4086CA24063AB30000D4CD53,
                                4086CA22063AB30000D4CD53,
                                4086CA23063AB30000D4CD53,
                                4086CA24063AB30000D4CD53,


@@ -3579,12 +3874,39 @@
                                407A90F9065742ED00F01665,
                                40F10E5A06AD0230003C7AC3,
                                40F10E5B06AD0230003C7AC3,
                                407A90F9065742ED00F01665,
                                40F10E5A06AD0230003C7AC3,
                                40F10E5B06AD0230003C7AC3,

-                               40DCE34506C744100000D83E,

                                40DCE35106C744C90000D83E,
                                40DCE35106C744C90000D83E,

-                               0A98CB570714687E007B4289,

                                0A98CB6C07146A06007B4289,
                                0A98CC490715CFBC007B4289,
                                0A98CC4D0715D045007B4289,
                                0A98CB6C07146A06007B4289,
                                0A98CC490715CFBC007B4289,
                                0A98CC4D0715D045007B4289,

+                               40670A8607377A6400F7C08C,
+                               40670A8707377A6400F7C08C,
+                               40670A9B07377B1000F7C08C,
+                               40670A9C07377B1000F7C08C,
+                               40670A9D07377B1000F7C08C,
+                               40670A9E07377B1000F7C08C,
+                               40607C1807493C3F00DC0420,
+                               40607C780749432A00DC0420,
+                               40607C790749432A00DC0420,
+                               40ECB13B074BD1D0005AAC48,
+                               40AF909207C8A926006A6D3C,
+                               40AF90A107C8A976006A6D3C,
+                               40AF90A207C8A976006A6D3C,
+                               40AF90A307C8A976006A6D3C,
+                               40AF90A507C8A976006A6D3C,
+                               40AF90A607C8A976006A6D3C,
+                               40AF90B707C8A9CF006A6D3C,
+                               40AF90B807C8A9CF006A6D3C,
+                               40AF90BF07C8AA08006A6D3C,
+                               40AF90C407C8AA17006A6D3C,
+                               40AF90F007C8B18C006A6D3C,
+                               40AF90F207C8B18C006A6D3C,
+                               40AF90F307C8B18C006A6D3C,
+                               40AF90F407C8B18C006A6D3C,
+                               40AF90F607C8B18C006A6D3C,
+                               40AF913707C8BD1F006A6D3C,
+                               40AF915407C8C912006A6D3C,
+                               40AF915507C8C912006A6D3C,
+                               401640E807F94B2800A8837A,

                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;


@@ -4303,12 +4625,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C947063AB30000D4CD53 = {
-                       fileRef = F5A8605B01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C948063AB30000D4CD53 = {
                        fileRef = F5A8606201FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C948063AB30000D4CD53 = {
                        fileRef = F5A8606201FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -4825,12 +5141,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C99E063AB30000D4CD53 = {
-                       fileRef = F5A8608501FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C99F063AB30000D4CD53 = {
                        fileRef = F5A8608601FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C99F063AB30000D4CD53 = {
                        fileRef = F5A8608601FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -4849,12 +5159,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086C9A2063AB30000D4CD53 = {
-                       fileRef = F5A8608901FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086C9A3063AB30000D4CD53 = {
                        fileRef = F5A8608B01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086C9A3063AB30000D4CD53 = {
                        fileRef = F5A8608B01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -5467,12 +5771,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CA0A063AB30000D4CD53 = {
-                       fileRef = F5A861C601FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CA0B063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CA0B063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -5605,12 +5903,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CA21063AB30000D4CD53 = {
-                       fileRef = F5A861AA01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CA22063AB30000D4CD53 = {
                        fileRef = F5A861A901FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CA22063AB30000D4CD53 = {
                        fileRef = F5A861A901FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -6072,7 +6364,6 @@
                                4086CAC1063AB30000D4CD53,
                                4086CAC2063AB30000D4CD53,
                                4086CAC3063AB30000D4CD53,
                                4086CAC1063AB30000D4CD53,
                                4086CAC2063AB30000D4CD53,
                                4086CAC3063AB30000D4CD53,

-                               4086CAC4063AB30000D4CD53,

                                4086CAC5063AB30000D4CD53,
                                4086CAC6063AB30000D4CD53,
                                4086CAC7063AB30000D4CD53,
                                4086CAC5063AB30000D4CD53,
                                4086CAC6063AB30000D4CD53,
                                4086CAC7063AB30000D4CD53,


@@ -6100,11 +6391,9 @@
                                4086CADD063AB30000D4CD53,
                                4086CADE063AB30000D4CD53,
                                4086CADF063AB30000D4CD53,
                                4086CADD063AB30000D4CD53,
                                4086CADE063AB30000D4CD53,
                                4086CADF063AB30000D4CD53,

-                               4086CAE0063AB30000D4CD53,

                                4086CAE1063AB30000D4CD53,
                                4086CAE2063AB30000D4CD53,
                                4086CAE3063AB30000D4CD53,
                                4086CAE1063AB30000D4CD53,
                                4086CAE2063AB30000D4CD53,
                                4086CAE3063AB30000D4CD53,

-                               4086CAE4063AB30000D4CD53,

                                4086CAE5063AB30000D4CD53,
                                4086CAE6063AB30000D4CD53,
                                4086CAE7063AB30000D4CD53,
                                4086CAE5063AB30000D4CD53,
                                4086CAE6063AB30000D4CD53,
                                4086CAE7063AB30000D4CD53,


@@ -6198,7 +6487,6 @@
                                4086CB40063AB30000D4CD53,
                                4086CB41063AB30000D4CD53,
                                4086CB42063AB30000D4CD53,
                                4086CB40063AB30000D4CD53,
                                4086CB41063AB30000D4CD53,
                                4086CB42063AB30000D4CD53,

-                               4086CB43063AB30000D4CD53,

                                4086CB44063AB30000D4CD53,
                                4086CB45063AB30000D4CD53,
                                4086CB46063AB30000D4CD53,
                                4086CB44063AB30000D4CD53,
                                4086CB45063AB30000D4CD53,
                                4086CB46063AB30000D4CD53,


@@ -6258,7 +6546,6 @@
                                4086CB7C063AB30000D4CD53,
                                4086CB7D063AB30000D4CD53,
                                4086CB7E063AB30000D4CD53,
                                4086CB7C063AB30000D4CD53,
                                4086CB7D063AB30000D4CD53,
                                4086CB7E063AB30000D4CD53,

-                               4086CB7F063AB30000D4CD53,

                                4086CB80063AB30000D4CD53,
                                4086CB81063AB30000D4CD53,
                                4086CB82063AB30000D4CD53,
                                4086CB80063AB30000D4CD53,
                                4086CB81063AB30000D4CD53,
                                4086CB82063AB30000D4CD53,


@@ -6350,12 +6637,39 @@
                                407A90F7065742ED00F01665,
                                40F10E5C06AD0230003C7AC3,
                                40F10E5D06AD0230003C7AC3,
                                407A90F7065742ED00F01665,
                                40F10E5C06AD0230003C7AC3,
                                40F10E5D06AD0230003C7AC3,

-                               40DCE34606C744100000D83E,

                                40DCE35206C744C90000D83E,
                                40DCE35206C744C90000D83E,

-                               0A98CB580714687E007B4289,

                                0A98CB6D07146A06007B4289,
                                0A98CC4A0715CFBC007B4289,
                                0A98CC4E0715D04C007B4289,
                                0A98CB6D07146A06007B4289,
                                0A98CC4A0715CFBC007B4289,
                                0A98CC4E0715D04C007B4289,

+                               40670A8807377A6400F7C08C,
+                               40670A8907377A6400F7C08C,
+                               40670A9F07377B1000F7C08C,
+                               40670AA007377B1000F7C08C,
+                               40670AA107377B1000F7C08C,
+                               40670AA207377B1000F7C08C,
+                               40607C1A07493C3F00DC0420,
+                               40607C7A0749432A00DC0420,
+                               40607C7B0749432B00DC0420,
+                               40ECB13C074BD1D0005AAC48,
+                               40AF909307C8A926006A6D3C,
+                               40AF90A707C8A976006A6D3C,
+                               40AF90A807C8A976006A6D3C,
+                               40AF90A907C8A976006A6D3C,
+                               40AF90AB07C8A976006A6D3C,
+                               40AF90AC07C8A976006A6D3C,
+                               40AF90B907C8A9CF006A6D3C,
+                               40AF90BA07C8A9CF006A6D3C,
+                               40AF90C007C8AA08006A6D3C,
+                               40AF90C507C8AA17006A6D3C,
+                               40AF90F707C8B18C006A6D3C,
+                               40AF90F907C8B18C006A6D3C,
+                               40AF90FA07C8B18C006A6D3C,
+                               40AF90FB07C8B18C006A6D3C,
+                               40AF90FD07C8B18C006A6D3C,
+                               40AF913807C8BD1F006A6D3C,
+                               40AF915607C8C912006A6D3C,
+                               40AF915707C8C912006A6D3C,
+                               401640E607F94B2800A8837A,

                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;


@@ -6996,12 +7310,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CAC4063AB30000D4CD53 = {
-                       fileRef = F5A8605B01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CAC5063AB30000D4CD53 = {
                        fileRef = F5A8605E01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CAC5063AB30000D4CD53 = {
                        fileRef = F5A8605E01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -7164,12 +7472,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CAE0063AB30000D4CD53 = {
-                       fileRef = F5A8608901FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CAE1063AB30000D4CD53 = {
                        fileRef = F5A8608801FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CAE1063AB30000D4CD53 = {
                        fileRef = F5A8608801FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -7188,12 +7490,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CAE4063AB30000D4CD53 = {
-                       fileRef = F5A8608501FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CAE5063AB30000D4CD53 = {
                        fileRef = F5A8608101FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CAE5063AB30000D4CD53 = {
                        fileRef = F5A8608101FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -7752,12 +8048,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CB43063AB30000D4CD53 = {
-                       fileRef = F5A861AA01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CB44063AB30000D4CD53 = {
                        fileRef = F5A861AB01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CB44063AB30000D4CD53 = {
                        fileRef = F5A861AB01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -8112,12 +8402,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CB7F063AB30000D4CD53 = {
-                       fileRef = F5A861C601FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CB80063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CB80063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -8869,7 +9153,6 @@
                                4086CC5A063AB30000D4CD53,
                                4086CC5B063AB30000D4CD53,
                                4086CC5C063AB30000D4CD53,
                                4086CC5A063AB30000D4CD53,
                                4086CC5B063AB30000D4CD53,
                                4086CC5C063AB30000D4CD53,

-                               4086CC5D063AB30000D4CD53,

                                4086CC5E063AB30000D4CD53,
                                4086CC5F063AB30000D4CD53,
                                4086CC60063AB30000D4CD53,
                                4086CC5E063AB30000D4CD53,
                                4086CC5F063AB30000D4CD53,
                                4086CC60063AB30000D4CD53,


@@ -8956,11 +9239,9 @@
                                4086CCB1063AB30000D4CD53,
                                4086CCB2063AB30000D4CD53,
                                4086CCB3063AB30000D4CD53,
                                4086CCB1063AB30000D4CD53,
                                4086CCB2063AB30000D4CD53,
                                4086CCB3063AB30000D4CD53,

-                               4086CCB4063AB30000D4CD53,

                                4086CCB5063AB30000D4CD53,
                                4086CCB6063AB30000D4CD53,
                                4086CCB7063AB30000D4CD53,
                                4086CCB5063AB30000D4CD53,
                                4086CCB6063AB30000D4CD53,
                                4086CCB7063AB30000D4CD53,

-                               4086CCB8063AB30000D4CD53,

                                4086CCB9063AB30000D4CD53,
                                4086CCBA063AB30000D4CD53,
                                4086CCBB063AB30000D4CD53,
                                4086CCB9063AB30000D4CD53,
                                4086CCBA063AB30000D4CD53,
                                4086CCBB063AB30000D4CD53,


@@ -9063,7 +9344,6 @@
                                4086CD1D063AB30000D4CD53,
                                4086CD1E063AB30000D4CD53,
                                4086CD1F063AB30000D4CD53,
                                4086CD1D063AB30000D4CD53,
                                4086CD1E063AB30000D4CD53,
                                4086CD1F063AB30000D4CD53,

-                               4086CD20063AB30000D4CD53,

                                4086CD21063AB30000D4CD53,
                                4086CD22063AB30000D4CD53,
                                4086CD23063AB30000D4CD53,
                                4086CD21063AB30000D4CD53,
                                4086CD22063AB30000D4CD53,
                                4086CD23063AB30000D4CD53,


@@ -9086,7 +9366,6 @@
                                4086CD34063AB30000D4CD53,
                                4086CD35063AB30000D4CD53,
                                4086CD36063AB30000D4CD53,
                                4086CD34063AB30000D4CD53,
                                4086CD35063AB30000D4CD53,
                                4086CD36063AB30000D4CD53,

-                               4086CD37063AB30000D4CD53,

                                4086CD38063AB30000D4CD53,
                                4086CD39063AB30000D4CD53,
                                4086CD3A063AB30000D4CD53,
                                4086CD38063AB30000D4CD53,
                                4086CD39063AB30000D4CD53,
                                4086CD3A063AB30000D4CD53,


@@ -9134,12 +9413,39 @@
                                407A90F8065742ED00F01665,
                                40F10E5E06AD0230003C7AC3,
                                40F10E5F06AD0230003C7AC3,
                                407A90F8065742ED00F01665,
                                40F10E5E06AD0230003C7AC3,
                                40F10E5F06AD0230003C7AC3,

-                               40DCE34706C744100000D83E,

                                40DCE35306C744C90000D83E,
                                40DCE35306C744C90000D83E,

-                               0A98CB590714687E007B4289,

                                0A98CB6E07146A06007B4289,
                                0A98CC4B0715CFBC007B4289,
                                0A98CC4F0715D053007B4289,
                                0A98CB6E07146A06007B4289,
                                0A98CC4B0715CFBC007B4289,
                                0A98CC4F0715D053007B4289,

+                               40670A8A07377A6400F7C08C,
+                               40670A8B07377A6400F7C08C,
+                               40670AA307377B1000F7C08C,
+                               40670AA407377B1000F7C08C,
+                               40670AA507377B1000F7C08C,
+                               40670AA607377B1000F7C08C,
+                               40607C1C07493C3F00DC0420,
+                               40607C7C0749432B00DC0420,
+                               40607C7D0749432B00DC0420,
+                               40ECB13D074BD1D0005AAC48,
+                               40AF909407C8A926006A6D3C,
+                               40AF90AD07C8A976006A6D3C,
+                               40AF90AE07C8A976006A6D3C,
+                               40AF90AF07C8A976006A6D3C,
+                               40AF90B107C8A976006A6D3C,
+                               40AF90B207C8A976006A6D3C,
+                               40AF90BB07C8A9CF006A6D3C,
+                               40AF90BC07C8A9CF006A6D3C,
+                               40AF90C107C8AA08006A6D3C,
+                               40AF90C607C8AA17006A6D3C,
+                               40AF90FE07C8B18C006A6D3C,
+                               40AF910007C8B18C006A6D3C,
+                               40AF910107C8B18C006A6D3C,
+                               40AF910207C8B18C006A6D3C,
+                               40AF910407C8B18C006A6D3C,
+                               40AF913907C8BD1F006A6D3C,
+                               40AF915807C8C912006A6D3C,
+                               40AF915907C8C912006A6D3C,
+                               401640E707F94B2800A8837A,

                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;


@@ -9858,12 +10164,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CC5D063AB30000D4CD53 = {
-                       fileRef = F5A8605B01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CC5E063AB30000D4CD53 = {
                        fileRef = F5A8606201FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CC5E063AB30000D4CD53 = {
                        fileRef = F5A8606201FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -10380,12 +10680,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CCB4063AB30000D4CD53 = {
-                       fileRef = F5A8608501FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CCB5063AB30000D4CD53 = {
                        fileRef = F5A8608601FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CCB5063AB30000D4CD53 = {
                        fileRef = F5A8608601FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -10404,12 +10698,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CCB8063AB30000D4CD53 = {
-                       fileRef = F5A8608901FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CCB9063AB30000D4CD53 = {
                        fileRef = F5A8608B01FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CCB9063AB30000D4CD53 = {
                        fileRef = F5A8608B01FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -11022,12 +11310,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CD20063AB30000D4CD53 = {
-                       fileRef = F5A861C601FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CD21063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CD21063AB30000D4CD53 = {
                        fileRef = F5A861C501FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -11160,12 +11442,6 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CD37063AB30000D4CD53 = {
-                       fileRef = F5A861AA01FA022C0175ACA7;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };

                4086CD38063AB30000D4CD53 = {
                        fileRef = F5A861A901FA022C0175ACA7;
                        isa = PBXBuildFile;
                4086CD38063AB30000D4CD53 = {
                        fileRef = F5A861A901FA022C0175ACA7;
                        isa = PBXBuildFile;


@@ -11238,381 +11514,959 @@
                        settings = {
                        };
                };
                        settings = {
                        };
                };

-               4086CD44063AB30000D4CD53 = {
-                       fileRef = F5A8619A01FA022C0175ACA7;
+               4086CD44063AB30000D4CD53 = {
+                       fileRef = F5A8619A01FA022C0175ACA7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD45063AB30000D4CD53 = {
+                       fileRef = F58E04FD02F11FA701A8020C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD46063AB30000D4CD53 = {
+                       fileRef = F5AC2EDD03803A3601000133;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD47063AB30000D4CD53 = {
+                       fileRef = F5AC2EDE03803A3601000133;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD48063AB30000D4CD53 = {
+                       fileRef = CADEF54103C8C0A800000133;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD49063AB30000D4CD53 = {
+                       fileRef = CADEF54303C8C0A800000133;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4A063AB30000D4CD53 = {
+                       fileRef = CA0CB57B0450773900000102;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4B063AB30000D4CD53 = {
+                       fileRef = CA0CB57C0450773900000102;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4C063AB30000D4CD53 = {
+                       fileRef = CA0CB57D0450773900000102;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4D063AB30000D4CD53 = {
+                       fileRef = CA0CB57E0450773900000102;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4E063AB30000D4CD53 = {
+                       fileRef = CA60175604D43A2700000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD4F063AB30000D4CD53 = {
+                       fileRef = CA60175904D43A5400000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD50063AB30000D4CD53 = {
+                       fileRef = CA60175C04D43A8100000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD51063AB30000D4CD53 = {
+                       fileRef = CA60175D04D43A8100000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD52063AB30000D4CD53 = {
+                       fileRef = CA60175E04D43A8100000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD53063AB30000D4CD53 = {
+                       fileRef = CA60176504D43AE200000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD54063AB30000D4CD53 = {
+                       fileRef = CA60176904D43BF100000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD55063AB30000D4CD53 = {
+                       fileRef = CA60176C04D43CAA00000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD56063AB30000D4CD53 = {
+                       fileRef = CA60176D04D43CAA00000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD57063AB30000D4CD53 = {
+                       fileRef = CA60177204D43D2300000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD58063AB30000D4CD53 = {
+                       fileRef = CA89578504D7052700000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD59063AB30000D4CD53 = {
+                       fileRef = CA89578904D705D700000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD5A063AB30000D4CD53 = {
+                       fileRef = CA8CC823050E6CD800000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD5B063AB30000D4CD53 = {
+                       fileRef = CA8CC824050E6CD800000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD5C063AB30000D4CD53 = {
+                       fileRef = CA8CC825050E6CD800000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD5D063AB30000D4CD53 = {
+                       fileRef = CA8CC832050EE2BD00000080;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD5E063AB30000D4CD53 = {
+                       fileRef = 4086C3A2063A454900D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD60063AB30000D4CD53 = {
+                       fileRef = 4086C59F063AA5C700D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD63063AB30000D4CD53 = {
+                       fileRef = 4086C638063AAD4A00D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD64063AB30000D4CD53 = {
+                       fileRef = 4086C63B063AAD4A00D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD65063AB30000D4CD53 = {
+                       fileRef = 4086C641063AAD4A00D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD66063AB30000D4CD53 = {
+                       fileRef = 4086C643063AAD4A00D4CD53;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD67063AB30000D4CD53 = {
+                       buildActionMask = 2147483647;
+                       files = (
+                               4086CD68063AB30000D4CD53,
+                               4086CD69063AB30000D4CD53,
+                               4086CD6A063AB30000D4CD53,
+                               405DD169063C2BFC00F579EE,
+                               0A98CD2607172992007B4289,
+                       );
+                       isa = PBXFrameworksBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4086CD68063AB30000D4CD53 = {
+                       fileRef = F55E08F801FDF9CC01000133;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD69063AB30000D4CD53 = {
+                       fileRef = F5C5D3DF01FA2D0A01D0F0BA;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD6A063AB30000D4CD53 = {
+                       fileRef = 08FB77AAFE841565C02AAC07;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               4086CD6B063AB30000D4CD53 = {
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       isa = PBXRezBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               4086CD6D063AB30000D4CD53 = {
+                       explicitFileType = "compiled.mach-o.dylib";
+                       includeInIndex = 0;
+                       isa = PBXFileReference;
+                       path = libwx_mac.dylib;
+                       refType = 3;
+                       sourceTree = BUILT_PRODUCTS_DIR;
+               };
+               4086D1FA063BC03E00D4CD53 = {
+                       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,
+                               4086D205063BC05E00D4CD53,
+                               4086D207063BC05E00D4CD53,
+                               4086D209063BC05E00D4CD53,
+                       );
+                       isa = PBXAggregateTarget;
+                       name = "Build All";
+                       productName = "Build All";
+               };
+               4086D202063BC05E00D4CD53 = {
+                       containerPortal = 0867D690FE84028FC02AAC07;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4086C742063AB2FF00D4CD53;
+                       remoteInfo = wxStaticDebug;
+               };
+               4086D203063BC05E00D4CD53 = {
+                       isa = PBXTargetDependency;
+                       target = 4086C742063AB2FF00D4CD53;
+                       targetProxy = 4086D202063BC05E00D4CD53;
+               };
+               4086D204063BC05E00D4CD53 = {
+                       containerPortal = 0867D690FE84028FC02AAC07;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4086C8CC063AB30000D4CD53;
+                       remoteInfo = wxStaticRelease;
+               };
+               4086D205063BC05E00D4CD53 = {
+                       isa = PBXTargetDependency;
+                       target = 4086C8CC063AB30000D4CD53;
+                       targetProxy = 4086D204063BC05E00D4CD53;
+               };
+               4086D206063BC05E00D4CD53 = {
+                       containerPortal = 0867D690FE84028FC02AAC07;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4086CA55063AB30000D4CD53;
+                       remoteInfo = wxDynamicDebug;
+               };
+               4086D207063BC05E00D4CD53 = {
+                       isa = PBXTargetDependency;
+                       target = 4086CA55063AB30000D4CD53;
+                       targetProxy = 4086D206063BC05E00D4CD53;
+               };
+               4086D208063BC05E00D4CD53 = {
+                       containerPortal = 0867D690FE84028FC02AAC07;
+                       isa = PBXContainerItemProxy;
+                       proxyType = 1;
+                       remoteGlobalIDString = 4086CBE2063AB30000D4CD53;
+                       remoteInfo = wxDynamicRelease;
+               };
+               4086D209063BC05E00D4CD53 = {
+                       isa = PBXTargetDependency;
+                       target = 4086CBE2063AB30000D4CD53;
+                       targetProxy = 4086D208063BC05E00D4CD53;
+               };
+               409E9DD5065140690091DE7E = {
+                       buildActionMask = 2147483647;
+                       dstPath = "";
+                       dstSubfolderSpec = 7;
+                       files = (
+                       );
+                       isa = PBXCopyFilesBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
+               40AF909007C8A926006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = mediactrlcmn.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909107C8A926006A6D3C = {
+                       fileRef = 40AF909007C8A926006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909207C8A926006A6D3C = {
+                       fileRef = 40AF909007C8A926006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909307C8A926006A6D3C = {
+                       fileRef = 40AF909007C8A926006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909407C8A926006A6D3C = {
+                       fileRef = 40AF909007C8A926006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909507C8A976006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = datectlg.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909607C8A976006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = filedlgg.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909707C8A976006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = htmllbox.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909907C8A976006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = vlbox.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909A07C8A976006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = vscroll.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF909B07C8A976006A6D3C = {
+                       fileRef = 40AF909507C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909C07C8A976006A6D3C = {
+                       fileRef = 40AF909607C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909D07C8A976006A6D3C = {
+                       fileRef = 40AF909707C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF909F07C8A976006A6D3C = {
+                       fileRef = 40AF909907C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A007C8A976006A6D3C = {
+                       fileRef = 40AF909A07C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A107C8A976006A6D3C = {
+                       fileRef = 40AF909507C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A207C8A976006A6D3C = {
+                       fileRef = 40AF909607C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A307C8A976006A6D3C = {
+                       fileRef = 40AF909707C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A507C8A976006A6D3C = {
+                       fileRef = 40AF909907C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A607C8A976006A6D3C = {
+                       fileRef = 40AF909A07C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A707C8A976006A6D3C = {
+                       fileRef = 40AF909507C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A807C8A976006A6D3C = {
+                       fileRef = 40AF909607C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90A907C8A976006A6D3C = {
+                       fileRef = 40AF909707C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90AB07C8A976006A6D3C = {
+                       fileRef = 40AF909907C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90AC07C8A976006A6D3C = {
+                       fileRef = 40AF909A07C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90AD07C8A976006A6D3C = {
+                       fileRef = 40AF909507C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90AE07C8A976006A6D3C = {
+                       fileRef = 40AF909607C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90AF07C8A976006A6D3C = {
+                       fileRef = 40AF909707C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B107C8A976006A6D3C = {
+                       fileRef = 40AF909907C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B207C8A976006A6D3C = {
+                       fileRef = 40AF909A07C8A976006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B307C8A9CF006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       name = hid.cpp;
+                       path = mac/corefoundation/hid.cpp;
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               40AF90B407C8A9CF006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       name = hidjoystick.cpp;
+                       path = mac/corefoundation/hidjoystick.cpp;
+                       refType = 2;
+                       sourceTree = SOURCE_ROOT;
+               };
+               40AF90B507C8A9CF006A6D3C = {
+                       fileRef = 40AF90B307C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B607C8A9CF006A6D3C = {
+                       fileRef = 40AF90B407C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B707C8A9CF006A6D3C = {
+                       fileRef = 40AF90B307C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B807C8A9CF006A6D3C = {
+                       fileRef = 40AF90B407C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90B907C8A9CF006A6D3C = {
+                       fileRef = 40AF90B307C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90BA07C8A9CF006A6D3C = {
+                       fileRef = 40AF90B407C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90BB07C8A9CF006A6D3C = {
+                       fileRef = 40AF90B307C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90BC07C8A9CF006A6D3C = {
+                       fileRef = 40AF90B407C8A9CF006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90BD07C8AA08006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = dlunix.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90BE07C8AA08006A6D3C = {
+                       fileRef = 40AF90BD07C8AA08006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90BF07C8AA08006A6D3C = {
+                       fileRef = 40AF90BD07C8AA08006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C007C8AA08006A6D3C = {
+                       fileRef = 40AF90BD07C8AA08006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C107C8AA08006A6D3C = {
+                       fileRef = 40AF90BD07C8AA08006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C207C8AA17006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = chm.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90C307C8AA17006A6D3C = {
+                       fileRef = 40AF90C207C8AA17006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C407C8AA17006A6D3C = {
+                       fileRef = 40AF90C207C8AA17006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C507C8AA17006A6D3C = {
+                       fileRef = 40AF90C207C8AA17006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90C607C8AA17006A6D3C = {
+                       fileRef = 40AF90C207C8AA17006A6D3C;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               40AF90E207C8B18C006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.objcpp;
+                       path = colordlgosx.mm;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90E407C8B18C006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = dccg.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90E507C8B18C006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = drawer.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90E607C8B18C006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.objcpp;
+                       path = fontdlgosx.mm;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90E807C8B18C006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = mediactrl.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               40AF90E907C8B18C006A6D3C = {
+                       fileRef = 40AF90E207C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD45063AB30000D4CD53 = {
-                       fileRef = F58E04FD02F11FA701A8020C;
+               40AF90EB07C8B18C006A6D3C = {
+                       fileRef = 40AF90E407C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD46063AB30000D4CD53 = {
-                       fileRef = F5AC2EDD03803A3601000133;
+               40AF90EC07C8B18C006A6D3C = {
+                       fileRef = 40AF90E507C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD47063AB30000D4CD53 = {
-                       fileRef = F5AC2EDE03803A3601000133;
+               40AF90ED07C8B18C006A6D3C = {
+                       fileRef = 40AF90E607C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD48063AB30000D4CD53 = {
-                       fileRef = CADEF54103C8C0A800000133;
+               40AF90EF07C8B18C006A6D3C = {
+                       fileRef = 40AF90E807C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD49063AB30000D4CD53 = {
-                       fileRef = CADEF54303C8C0A800000133;
+               40AF90F007C8B18C006A6D3C = {
+                       fileRef = 40AF90E207C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4A063AB30000D4CD53 = {
-                       fileRef = CA0CB57B0450773900000102;
+               40AF90F207C8B18C006A6D3C = {
+                       fileRef = 40AF90E407C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4B063AB30000D4CD53 = {
-                       fileRef = CA0CB57C0450773900000102;
+               40AF90F307C8B18C006A6D3C = {
+                       fileRef = 40AF90E507C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4C063AB30000D4CD53 = {
-                       fileRef = CA0CB57D0450773900000102;
+               40AF90F407C8B18C006A6D3C = {
+                       fileRef = 40AF90E607C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4D063AB30000D4CD53 = {
-                       fileRef = CA0CB57E0450773900000102;
+               40AF90F607C8B18C006A6D3C = {
+                       fileRef = 40AF90E807C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4E063AB30000D4CD53 = {
-                       fileRef = CA60175604D43A2700000080;
+               40AF90F707C8B18C006A6D3C = {
+                       fileRef = 40AF90E207C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD4F063AB30000D4CD53 = {
-                       fileRef = CA60175904D43A5400000080;
+               40AF90F907C8B18C006A6D3C = {
+                       fileRef = 40AF90E407C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD50063AB30000D4CD53 = {
-                       fileRef = CA60175C04D43A8100000080;
+               40AF90FA07C8B18C006A6D3C = {
+                       fileRef = 40AF90E507C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD51063AB30000D4CD53 = {
-                       fileRef = CA60175D04D43A8100000080;
+               40AF90FB07C8B18C006A6D3C = {
+                       fileRef = 40AF90E607C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD52063AB30000D4CD53 = {
-                       fileRef = CA60175E04D43A8100000080;
+               40AF90FD07C8B18C006A6D3C = {
+                       fileRef = 40AF90E807C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD53063AB30000D4CD53 = {
-                       fileRef = CA60176504D43AE200000080;
+               40AF90FE07C8B18C006A6D3C = {
+                       fileRef = 40AF90E207C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD54063AB30000D4CD53 = {
-                       fileRef = CA60176904D43BF100000080;
+               40AF910007C8B18C006A6D3C = {
+                       fileRef = 40AF90E407C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD55063AB30000D4CD53 = {
-                       fileRef = CA60176C04D43CAA00000080;
+               40AF910107C8B18C006A6D3C = {
+                       fileRef = 40AF90E507C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD56063AB30000D4CD53 = {
-                       fileRef = CA60176D04D43CAA00000080;
+               40AF910207C8B18C006A6D3C = {
+                       fileRef = 40AF90E607C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD57063AB30000D4CD53 = {
-                       fileRef = CA60177204D43D2300000080;
+               40AF910407C8B18C006A6D3C = {
+                       fileRef = 40AF90E807C8B18C006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD58063AB30000D4CD53 = {
-                       fileRef = CA89578504D7052700000080;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
+               40AF913507C8BD1F006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.cpp.cpp;
+                       path = combobox.cpp;
+                       refType = 4;
+                       sourceTree = "<group>";

                };
                };

-               4086CD59063AB30000D4CD53 = {
-                       fileRef = CA89578904D705D700000080;
+               40AF913607C8BD1F006A6D3C = {
+                       fileRef = 40AF913507C8BD1F006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD5A063AB30000D4CD53 = {
-                       fileRef = CA8CC823050E6CD800000080;
+               40AF913707C8BD1F006A6D3C = {
+                       fileRef = 40AF913507C8BD1F006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD5B063AB30000D4CD53 = {
-                       fileRef = CA8CC824050E6CD800000080;
+               40AF913807C8BD1F006A6D3C = {
+                       fileRef = 40AF913507C8BD1F006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD5C063AB30000D4CD53 = {
-                       fileRef = CA8CC825050E6CD800000080;
+               40AF913907C8BD1F006A6D3C = {
+                       fileRef = 40AF913507C8BD1F006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD5D063AB30000D4CD53 = {
-                       fileRef = CA8CC832050EE2BD00000080;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
+               40AF915007C8C912006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.c;
+                       path = tif_color.c;
+                       refType = 4;
+                       sourceTree = "<group>";

                };
                };

-               4086CD5E063AB30000D4CD53 = {
-                       fileRef = 4086C3A2063A454900D4CD53;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
+               40AF915107C8C912006A6D3C = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.c;
+                       path = tif_extension.c;
+                       refType = 4;
+                       sourceTree = "<group>";

                };
                };

-               4086CD60063AB30000D4CD53 = {
-                       fileRef = 4086C59F063AA5C700D4CD53;
+               40AF915207C8C912006A6D3C = {
+                       fileRef = 40AF915007C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD63063AB30000D4CD53 = {
-                       fileRef = 4086C638063AAD4A00D4CD53;
+               40AF915307C8C912006A6D3C = {
+                       fileRef = 40AF915107C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD64063AB30000D4CD53 = {
-                       fileRef = 4086C63B063AAD4A00D4CD53;
+               40AF915407C8C912006A6D3C = {
+                       fileRef = 40AF915007C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD65063AB30000D4CD53 = {
-                       fileRef = 4086C641063AAD4A00D4CD53;
+               40AF915507C8C912006A6D3C = {
+                       fileRef = 40AF915107C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD66063AB30000D4CD53 = {
-                       fileRef = 4086C643063AAD4A00D4CD53;
+               40AF915607C8C912006A6D3C = {
+                       fileRef = 40AF915007C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD67063AB30000D4CD53 = {
-                       buildActionMask = 2147483647;
-                       files = (
-                               4086CD68063AB30000D4CD53,
-                               4086CD69063AB30000D4CD53,
-                               4086CD6A063AB30000D4CD53,
-                               405DD169063C2BFC00F579EE,
-                               0A98CD2607172992007B4289,
-                       );
-                       isa = PBXFrameworksBuildPhase;
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4086CD68063AB30000D4CD53 = {
-                       fileRef = F55E08F801FDF9CC01000133;
+               40AF915707C8C912006A6D3C = {
+                       fileRef = 40AF915107C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD69063AB30000D4CD53 = {
-                       fileRef = F5C5D3DF01FA2D0A01D0F0BA;
+               40AF915807C8C912006A6D3C = {
+                       fileRef = 40AF915007C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD6A063AB30000D4CD53 = {
-                       fileRef = 08FB77AAFE841565C02AAC07;
+               40AF915907C8C912006A6D3C = {
+                       fileRef = 40AF915107C8C912006A6D3C;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               4086CD6B063AB30000D4CD53 = {
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       isa = PBXRezBuildPhase;
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               4086CD6D063AB30000D4CD53 = {
-                       explicitFileType = "compiled.mach-o.dylib";
-                       includeInIndex = 0;
-                       isa = PBXFileReference;
-                       path = libwx_mac.dylib;
-                       refType = 3;
-                       sourceTree = BUILT_PRODUCTS_DIR;
-               };
-               4086D1FA063BC03E00D4CD53 = {
-                       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,
-                               4086D205063BC05E00D4CD53,
-                               4086D207063BC05E00D4CD53,
-                               4086D209063BC05E00D4CD53,
-                       );
-                       isa = PBXAggregateTarget;
-                       name = "Build All";
-                       productName = "Build All";
-               };
-               4086D202063BC05E00D4CD53 = {
-                       containerPortal = 0867D690FE84028FC02AAC07;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4086C742063AB2FF00D4CD53;
-                       remoteInfo = wxStaticDebug;
-               };
-               4086D203063BC05E00D4CD53 = {
-                       isa = PBXTargetDependency;
-                       target = 4086C742063AB2FF00D4CD53;
-                       targetProxy = 4086D202063BC05E00D4CD53;
-               };
-               4086D204063BC05E00D4CD53 = {
-                       containerPortal = 0867D690FE84028FC02AAC07;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4086C8CC063AB30000D4CD53;
-                       remoteInfo = wxStaticRelease;
-               };
-               4086D205063BC05E00D4CD53 = {
-                       isa = PBXTargetDependency;
-                       target = 4086C8CC063AB30000D4CD53;
-                       targetProxy = 4086D204063BC05E00D4CD53;
-               };
-               4086D206063BC05E00D4CD53 = {
-                       containerPortal = 0867D690FE84028FC02AAC07;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4086CA55063AB30000D4CD53;
-                       remoteInfo = wxDynamicDebug;
-               };
-               4086D207063BC05E00D4CD53 = {
-                       isa = PBXTargetDependency;
-                       target = 4086CA55063AB30000D4CD53;
-                       targetProxy = 4086D206063BC05E00D4CD53;
-               };
-               4086D208063BC05E00D4CD53 = {
-                       containerPortal = 0867D690FE84028FC02AAC07;
-                       isa = PBXContainerItemProxy;
-                       proxyType = 1;
-                       remoteGlobalIDString = 4086CBE2063AB30000D4CD53;
-                       remoteInfo = wxDynamicRelease;
-               };
-               4086D209063BC05E00D4CD53 = {
-                       isa = PBXTargetDependency;
-                       target = 4086CBE2063AB30000D4CD53;
-                       targetProxy = 4086D208063BC05E00D4CD53;
-               };
-               409E9DD5065140690091DE7E = {
-                       buildActionMask = 2147483647;
-                       dstPath = "";
-                       dstSubfolderSpec = 7;
-                       files = (
-                       );
-                       isa = PBXCopyFilesBuildPhase;
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               40DCE34306C744100000D83E = {
+               40DCE34F06C744C90000D83E = {

                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.cpp.cpp;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.cpp.cpp;

-                       path = gsockosx.cpp;
+                       path = gsocket.cpp;

                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               40DCE34406C744100000D83E = {
-                       fileRef = 40DCE34306C744100000D83E;
+               40DCE35006C744C90000D83E = {
+                       fileRef = 40DCE34F06C744C90000D83E;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE34506C744100000D83E = {
-                       fileRef = 40DCE34306C744100000D83E;
+               40DCE35106C744C90000D83E = {
+                       fileRef = 40DCE34F06C744C90000D83E;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE34606C744100000D83E = {
-                       fileRef = 40DCE34306C744100000D83E;
+               40DCE35206C744C90000D83E = {
+                       fileRef = 40DCE34F06C744C90000D83E;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE34706C744100000D83E = {
-                       fileRef = 40DCE34306C744100000D83E;
+               40DCE35306C744C90000D83E = {
+                       fileRef = 40DCE34F06C744C90000D83E;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE34F06C744C90000D83E = {
+               40ECB139074BD1D0005AAC48 = {

                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.cpp.cpp;
                        fileEncoding = 30;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.cpp.cpp;

-                       path = gsocket.cpp;
+                       path = stdpaths.cpp;

                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               40DCE35006C744C90000D83E = {
-                       fileRef = 40DCE34F06C744C90000D83E;
+               40ECB13A074BD1D0005AAC48 = {
+                       fileRef = 40ECB139074BD1D0005AAC48;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE35106C744C90000D83E = {
-                       fileRef = 40DCE34F06C744C90000D83E;
+               40ECB13B074BD1D0005AAC48 = {
+                       fileRef = 40ECB139074BD1D0005AAC48;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE35206C744C90000D83E = {
-                       fileRef = 40DCE34F06C744C90000D83E;
+               40ECB13C074BD1D0005AAC48 = {
+                       fileRef = 40ECB139074BD1D0005AAC48;

                        isa = PBXBuildFile;
                        settings = {
                        };
                };
                        isa = PBXBuildFile;
                        settings = {
                        };
                };

-               40DCE35306C744C90000D83E = {
-                       fileRef = 40DCE34F06C744C90000D83E;
+               40ECB13D074BD1D0005AAC48 = {
+                       fileRef = 40ECB139074BD1D0005AAC48;

                        isa = PBXBuildFile;
                        settings = {
                        };
                        isa = PBXBuildFile;
                        settings = {
                        };


@@ -15212,6 +16066,7 @@
                                F5A8606E01FA022C0175ACA7,
                                F5A860F101FA022C0175ACA7,
                                F5A8613E01FA022C0175ACA7,
                                F5A8606E01FA022C0175ACA7,
                                F5A860F101FA022C0175ACA7,
                                F5A8613E01FA022C0175ACA7,

+                               40670A8107377A3600F7C08C,

                                F5A8619901FA022C0175ACA7,
                                F5A863AB01FA022C0175ACA7,
                                F5A8641801FA022D0175ACA7,
                                F5A8619901FA022C0175ACA7,
                                F5A863AB01FA022C0175ACA7,
                                F5A8641801FA022D0175ACA7,


@@ -15225,6 +16080,8 @@
                };
                F5A85FDD01FA022B0175ACA7 = {
                        children = (
                };
                F5A85FDD01FA022B0175ACA7 = {
                        children = (

+                               40AF909007C8A926006A6D3C,
+                               40607C1407493C3F00DC0420,

                                CA0CB57B0450773900000102,
                                CA60175604D43A2700000080,
                                F5A85FDF01FA022B0175ACA7,
                                CA0CB57B0450773900000102,
                                CA60175604D43A2700000080,
                                F5A85FDF01FA022B0175ACA7,


@@ -15283,6 +16140,7 @@
                                F5A8601201FA022B0175ACA7,
                                F5A8601301FA022B0175ACA7,
                                F5A8601401FA022B0175ACA7,
                                F5A8601201FA022B0175ACA7,
                                F5A8601301FA022B0175ACA7,
                                F5A8601401FA022B0175ACA7,

+                               40670A9307377B1000F7C08C,

                                F5A8601501FA022B0175ACA7,
                                F5A8601601FA022B0175ACA7,
                                F5A8601701FA022B0175ACA7,
                                F5A8601501FA022B0175ACA7,
                                F5A8601601FA022B0175ACA7,
                                F5A8601701FA022B0175ACA7,


@@ -15337,7 +16195,9 @@
                                F5AC2EDE03803A3601000133,
                                F5A8604A01FA022C0175ACA7,
                                F5A8604B01FA022C0175ACA7,
                                F5AC2EDE03803A3601000133,
                                F5A8604A01FA022C0175ACA7,
                                F5A8604B01FA022C0175ACA7,

+                               40670A9407377B1000F7C08C,

                                0A98CB6A07146A06007B4289,
                                0A98CB6A07146A06007B4289,

+                               40670A9507377B1000F7C08C,

                                F5A8604C01FA022C0175ACA7,
                                CA60175E04D43A8100000080,
                                F5A8604D01FA022C0175ACA7,
                                F5A8604C01FA022C0175ACA7,
                                CA60175E04D43A8100000080,
                                F5A8604D01FA022C0175ACA7,


@@ -15354,7 +16214,7 @@
                                F5A8605701FA022C0175ACA7,
                                F5A8605801FA022C0175ACA7,
                                F5A8605901FA022C0175ACA7,
                                F5A8605701FA022C0175ACA7,
                                F5A8605801FA022C0175ACA7,
                                F5A8605901FA022C0175ACA7,

-                               F5A8605B01FA022C0175ACA7,
+                               40670A9607377B1000F7C08C,

                                F5A8605D01FA022C0175ACA7,
                                F5A8605E01FA022C0175ACA7,
                                F5A8605F01FA022C0175ACA7,
                                F5A8605D01FA022C0175ACA7,
                                F5A8605E01FA022C0175ACA7,
                                F5A8605F01FA022C0175ACA7,


@@ -16327,14 +17187,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
                        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;
                F5A8605D01FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -16438,21 +17290,22 @@
                                F5A8607201FA022C0175ACA7,
                                F5A8607301FA022C0175ACA7,
                                F5A8607401FA022C0175ACA7,
                                F5A8607201FA022C0175ACA7,
                                F5A8607301FA022C0175ACA7,
                                F5A8607401FA022C0175ACA7,

+                               40AF909507C8A976006A6D3C,

                                F5A8607501FA022C0175ACA7,
                                F5A8607701FA022C0175ACA7,
                                F5A8607801FA022C0175ACA7,
                                F5A8607901FA022C0175ACA7,
                                F5A8607A01FA022C0175ACA7,
                                F5A8607501FA022C0175ACA7,
                                F5A8607701FA022C0175ACA7,
                                F5A8607801FA022C0175ACA7,
                                F5A8607901FA022C0175ACA7,
                                F5A8607A01FA022C0175ACA7,

+                               40AF909607C8A976006A6D3C,

                                F5A8607C01FA022C0175ACA7,
                                F5A8607D01FA022C0175ACA7,
                                F5A8607E01FA022C0175ACA7,
                                F5A8608001FA022C0175ACA7,
                                F5A8608101FA022C0175ACA7,
                                F5A8607C01FA022C0175ACA7,
                                F5A8607D01FA022C0175ACA7,
                                F5A8607E01FA022C0175ACA7,
                                F5A8608001FA022C0175ACA7,
                                F5A8608101FA022C0175ACA7,

-                               F5A8608501FA022C0175ACA7,
+                               40AF909707C8A976006A6D3C,

                                F5A8608601FA022C0175ACA7,
                                F5A8608701FA022C0175ACA7,
                                F5A8608801FA022C0175ACA7,
                                F5A8608601FA022C0175ACA7,
                                F5A8608701FA022C0175ACA7,
                                F5A8608801FA022C0175ACA7,

-                               F5A8608901FA022C0175ACA7,

                                F5A8608B01FA022C0175ACA7,
                                F5A8608D01FA022C0175ACA7,
                                F5A8608E01FA022C0175ACA7,
                                F5A8608B01FA022C0175ACA7,
                                F5A8608D01FA022C0175ACA7,
                                F5A8608E01FA022C0175ACA7,


@@ -16470,6 +17323,8 @@
                                F5A8609E01FA022C0175ACA7,
                                F5A8609F01FA022C0175ACA7,
                                F5A860A001FA022C0175ACA7,
                                F5A8609E01FA022C0175ACA7,
                                F5A8609F01FA022C0175ACA7,
                                F5A860A001FA022C0175ACA7,

+                               40AF909907C8A976006A6D3C,
+                               40AF909A07C8A976006A6D3C,

                                F5A860A201FA022C0175ACA7,
                        );
                        isa = PBXGroup;
                                F5A860A201FA022C0175ACA7,
                        );
                        isa = PBXGroup;


@@ -16597,14 +17452,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               F5A8608501FA022C0175ACA7 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.cpp;
-                       path = imaglist.cpp;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };

                F5A8608601FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                F5A8608601FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -16629,14 +17476,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               F5A8608901FA022C0175ACA7 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.cpp;
-                       path = msgdlgg.cpp;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };

                F5A8608B01FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                F5A8608B01FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -16767,6 +17606,7 @@
                };
                F5A860F101FA022C0175ACA7 = {
                        children = (
                };
                F5A860F101FA022C0175ACA7 = {
                        children = (

+                               40AF90C207C8AA17006A6D3C,

                                F5A8610401FA022C0175ACA7,
                                F5A8610501FA022C0175ACA7,
                                F5A8610601FA022C0175ACA7,
                                F5A8610401FA022C0175ACA7,
                                F5A8610501FA022C0175ACA7,
                                F5A8610601FA022C0175ACA7,


@@ -17381,13 +18221,15 @@
                                F5A861A601FA022C0175ACA7,
                                F5A861A701FA022C0175ACA7,
                                F5A861A801FA022C0175ACA7,
                                F5A861A601FA022C0175ACA7,
                                F5A861A701FA022C0175ACA7,
                                F5A861A801FA022C0175ACA7,

+                               40AF90E207C8B18C006A6D3C,

                                F5A861A901FA022C0175ACA7,
                                F5A861A901FA022C0175ACA7,

-                               F5A861AA01FA022C0175ACA7,
+                               40AF913507C8BD1F006A6D3C,

                                F5A861AB01FA022C0175ACA7,
                                F5A861AD01FA022C0175ACA7,
                                F5A861AE01FA022C0175ACA7,
                                F5A861AF01FA022C0175ACA7,
                                F5A861B001FA022C0175ACA7,
                                F5A861AB01FA022C0175ACA7,
                                F5A861AD01FA022C0175ACA7,
                                F5A861AE01FA022C0175ACA7,
                                F5A861AF01FA022C0175ACA7,
                                F5A861B001FA022C0175ACA7,

+                               40AF90E407C8B18C006A6D3C,

                                F5A861B101FA022C0175ACA7,
                                F5A861B201FA022C0175ACA7,
                                F5A861B301FA022C0175ACA7,
                                F5A861B101FA022C0175ACA7,
                                F5A861B201FA022C0175ACA7,
                                F5A861B301FA022C0175ACA7,


@@ -17397,21 +18239,22 @@
                                F5A861B701FA022C0175ACA7,
                                CADEF54103C8C0A800000133,
                                F5A861B801FA022C0175ACA7,
                                F5A861B701FA022C0175ACA7,
                                CADEF54103C8C0A800000133,
                                F5A861B801FA022C0175ACA7,

+                               40AF90E507C8B18C006A6D3C,

                                F5A861B901FA022C0175ACA7,
                                F5A861BB01FA022C0175ACA7,
                                F5A861B901FA022C0175ACA7,
                                F5A861BB01FA022C0175ACA7,

+                               40AF90E607C8B18C006A6D3C,

                                F5A861BC01FA022C0175ACA7,
                                F5A861BD01FA022C0175ACA7,
                                F5A861BE01FA022C0175ACA7,
                                F5A861BF01FA022C0175ACA7,
                                F5A861C001FA022C0175ACA7,
                                F5A861BC01FA022C0175ACA7,
                                F5A861BD01FA022C0175ACA7,
                                F5A861BE01FA022C0175ACA7,
                                F5A861BF01FA022C0175ACA7,
                                F5A861C001FA022C0175ACA7,

-                               40DCE34306C744100000D83E,

                                0A98CC470715CFBC007B4289,
                                4086C59F063AA5C700D4CD53,
                                0A98CC470715CFBC007B4289,
                                4086C59F063AA5C700D4CD53,

-                               0A98CB550714687E007B4289,

                                F5A861C501FA022C0175ACA7,
                                F5A861C501FA022C0175ACA7,

-                               F5A861C601FA022C0175ACA7,
+                               401640E507F94B2800A8837A,

                                F5A861C701FA022C0175ACA7,
                                F5A861C801FA022C0175ACA7,
                                F5A861C701FA022C0175ACA7,
                                F5A861C801FA022C0175ACA7,

+                               40AF90E807C8B18C006A6D3C,

                                F5A861CC01FA022C0175ACA7,
                                F5A861CD01FA022C0175ACA7,
                                F5A861CE01FA022C0175ACA7,
                                F5A861CC01FA022C0175ACA7,
                                F5A861CD01FA022C0175ACA7,
                                F5A861CE01FA022C0175ACA7,


@@ -17565,14 +18408,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               F5A861AA01FA022C0175ACA7 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.cpp;
-                       path = combobox.cpp;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };

                F5A861AB01FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                F5A861AB01FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -17749,14 +18584,6 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
                        refType = 4;
                        sourceTree = "<group>";
                };

-               F5A861C601FA022C0175ACA7 = {
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.cpp.cpp;
-                       path = joystick.cpp;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };

                F5A861C701FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;
                F5A861C701FA022C0175ACA7 = {
                        fileEncoding = 30;
                        isa = PBXFileReference;


@@ -18299,6 +19126,7 @@
                                F5A8642601FA022D0175ACA7,
                                F5A8642701FA022D0175ACA7,
                                F5A8642801FA022D0175ACA7,
                                F5A8642601FA022D0175ACA7,
                                F5A8642701FA022D0175ACA7,
                                F5A8642801FA022D0175ACA7,

+                               40AF915007C8C912006A6D3C,

                                F5A8642901FA022D0175ACA7,
                                F5A8642A01FA022D0175ACA7,
                                F5A8642C01FA022D0175ACA7,
                                F5A8642901FA022D0175ACA7,
                                F5A8642A01FA022D0175ACA7,
                                F5A8642C01FA022D0175ACA7,


@@ -18306,6 +19134,7 @@
                                F5A8642E01FA022D0175ACA7,
                                F5A8642F01FA022D0175ACA7,
                                F5A8643001FA022D0175ACA7,
                                F5A8642E01FA022D0175ACA7,
                                F5A8642F01FA022D0175ACA7,
                                F5A8643001FA022D0175ACA7,

+                               40AF915107C8C912006A6D3C,

                                F5A8643101FA022D0175ACA7,
                                F5A8643301FA022D0175ACA7,
                                F5A8643401FA022D0175ACA7,
                                F5A8643101FA022D0175ACA7,
                                F5A8643301FA022D0175ACA7,
                                F5A8643401FA022D0175ACA7,


@@ -18601,6 +19430,8 @@
                };
                F5A8648A01FA022D0175ACA7 = {
                        children = (
                };
                F5A8648A01FA022D0175ACA7 = {
                        children = (

+                               40AF90BD07C8AA08006A6D3C,
+                               40ECB139074BD1D0005AAC48,

                                CA60177204D43D2300000080,
                                40DCE34F06C744C90000D83E,
                                F5A8649201FA022D0175ACA7,
                                CA60177204D43D2300000080,
                                40DCE34F06C744C90000D83E,
                                F5A8649201FA022D0175ACA7,