Fixed a couple of introjucer problems. Reorganised some native code.

Builds/MacOSX/Juce.xcodeproj/project.pbxproj

@@ -281,8 +281,8 @@
 		C9FB7884928BF0D6140AF881 = { isa = PBXBuildFile; fileRef = 9DC2C10B16A645EEB82220D8; };
 		5C9628DB3E0C0BA8809AE45D = { isa = PBXBuildFile; fileRef = EE5F18DF1DED7617C4A41FF3; };
 		724DA2BCA5ABC5772604C3B4 = { isa = PBXBuildFile; fileRef = B2BCE9DDC8F0F54CA3D913E7; };
-		140FD4605CC549620CC7F44D = { isa = PBXBuildFile; fileRef = 562A8671221397C9CAD1BB2A; };
 		035B1F7B1505ABF24455690E = { isa = PBXBuildFile; fileRef = 5249EFBE3B22E6FC1A7B6D42; };
+		3C71EA297D7418FEBB52F9DD = { isa = PBXBuildFile; fileRef = A257B76FCE9D594EAD41414C; };
 		7A86E411B55E15DA7AF1FE67 = { isa = PBXBuildFile; fileRef = 8280AA34B23B4D366711A9E7; };
 		BD86381924AE45021246ABA3 = { isa = PBXBuildFile; fileRef = C9561A66310DAD5EEB4A9462; };
 		306AB64E97A05B800349E7E2 = { isa = PBXBuildFile; fileRef = B62991F8AEE7327BA8A5070F; };
@@ -296,7 +296,6 @@
 		D04EEEC7EAE7C806E95ED41C = { isa = PBXBuildFile; fileRef = 7DB37383434F45D8A7B674C3; };
 		7EA440527972D6B7322EC307 = { isa = PBXBuildFile; fileRef = CB16B2438EDCC10C499645E6; };
 		CB9FE1DA1AFE5FBA9FF06061 = { isa = PBXBuildFile; fileRef = BEB35C6173793C1CB7AB6311; };
-		DEDFFA49B5CBF862CD6EDFD4 = { isa = PBXBuildFile; fileRef = 1B00957D2190CF28CF03E304; };
 		26454A5DB5BAFD7901F17DA7 = { isa = PBXBuildFile; fileRef = BA58B49B820A47F6F55CDACB; };
 		F41B46F970BA78762DCE67D1 = { isa = PBXBuildFile; fileRef = 930E58E13FC92BF70AC20EEF; };
 		B7A8CF6F889840BED05C8C27 = { isa = PBXBuildFile; fileRef = 9113CDD122D2790E147A8CF5; };
@@ -308,6 +307,7 @@
 		5E330E219B2D2944BCE95174 = { isa = PBXBuildFile; fileRef = FE6E3F911679B0D7547577A3; };
 		275FBC09BE58E708A73B88C1 = { isa = PBXBuildFile; fileRef = 8BCE60CBC91DBAAB089958A1; };
 		6DA99BA218FB45568258841C = { isa = PBXBuildFile; fileRef = 3F11593DC3A168A52FCC2DD9; };
+		32F1C95EDEE7722797B8CEE8 = { isa = PBXBuildFile; fileRef = FC2C82760E717788B5A6E691; };
 		029A0E8B44DC17211722677D = { isa = PBXBuildFile; fileRef = 42059626955C547DA6AD3196; };
 		4B4E17467BC41E2166549998 = { isa = PBXBuildFile; fileRef = 8F383A785B4876198C5B0194; };
 		9686F29C29D1C26E353DE68A = { isa = PBXBuildFile; fileRef = F3B50EE3939E9F16D13C3C7C; };
@@ -982,8 +982,8 @@
 		9DC2C10B16A645EEB82220D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../src/native/linux/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		EE5F18DF1DED7617C4A41FF3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ios_Audio.cpp"; path = "../../src/native/mac/juce_ios_Audio.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B2BCE9DDC8F0F54CA3D913E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../src/native/mac/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
-		562A8671221397C9CAD1BB2A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MiscUtilities.mm"; path = "../../src/native/mac/juce_ios_MiscUtilities.mm"; sourceTree = "SOURCE_ROOT"; };
 		5249EFBE3B22E6FC1A7B6D42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_UIViewComponentPeer.mm"; path = "../../src/native/mac/juce_ios_UIViewComponentPeer.mm"; sourceTree = "SOURCE_ROOT"; };
+		A257B76FCE9D594EAD41414C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../src/native/mac/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		8280AA34B23B4D366711A9E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../src/native/mac/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
 		C9561A66310DAD5EEB4A9462 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDBurner.mm"; path = "../../src/native/mac/juce_mac_AudioCDBurner.mm"; sourceTree = "SOURCE_ROOT"; };
 		B62991F8AEE7327BA8A5070F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDReader.mm"; path = "../../src/native/mac/juce_mac_AudioCDReader.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -998,7 +998,6 @@
 		7DB37383434F45D8A7B674C3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Fonts.mm"; path = "../../src/native/mac/juce_mac_Fonts.mm"; sourceTree = "SOURCE_ROOT"; };
 		CB16B2438EDCC10C499645E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../src/native/mac/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		BEB35C6173793C1CB7AB6311 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MessageManager.mm"; path = "../../src/native/mac/juce_mac_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
-		1B00957D2190CF28CF03E304 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MiscUtilities.mm"; path = "../../src/native/mac/juce_mac_MiscUtilities.mm"; sourceTree = "SOURCE_ROOT"; };
 		BA58B49B820A47F6F55CDACB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../src/native/mac/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; };
 		930E58E13FC92BF70AC20EEF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NativeCode.mm"; path = "../../src/native/mac/juce_mac_NativeCode.mm"; sourceTree = "SOURCE_ROOT"; };
 		2F1812B26076D9CC1495D452 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_NativeIncludes.h"; path = "../../src/native/mac/juce_mac_NativeIncludes.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1012,6 +1011,7 @@
 		FE6E3F911679B0D7547577A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_SystemStats.mm"; path = "../../src/native/mac/juce_mac_SystemStats.mm"; sourceTree = "SOURCE_ROOT"; };
 		8BCE60CBC91DBAAB089958A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Threads.mm"; path = "../../src/native/mac/juce_mac_Threads.mm"; sourceTree = "SOURCE_ROOT"; };
 		3F11593DC3A168A52FCC2DD9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../src/native/mac/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; };
+		FC2C82760E717788B5A6E691 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Windowing.mm"; path = "../../src/native/mac/juce_mac_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		AB0F3F5A622CBB251F64945A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_MessageQueue.h"; path = "../../src/native/mac/juce_osx_MessageQueue.h"; sourceTree = "SOURCE_ROOT"; };
 		AD495FA1991295C722B46843 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_ObjCHelpers.h"; path = "../../src/native/mac/juce_osx_ObjCHelpers.h"; sourceTree = "SOURCE_ROOT"; };
 		42059626955C547DA6AD3196 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ActiveXComponent.cpp"; path = "../../src/native/windows/juce_win32_ActiveXComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1824,8 +1824,8 @@
 		13513EE40AD6BAB30E26C88B = { isa = PBXGroup; children = (
 				EE5F18DF1DED7617C4A41FF3,
 				B2BCE9DDC8F0F54CA3D913E7,
-				562A8671221397C9CAD1BB2A,
 				5249EFBE3B22E6FC1A7B6D42,
+				A257B76FCE9D594EAD41414C,
 				8280AA34B23B4D366711A9E7,
 				C9561A66310DAD5EEB4A9462,
 				B62991F8AEE7327BA8A5070F,
@@ -1840,7 +1840,6 @@
 				7DB37383434F45D8A7B674C3,
 				CB16B2438EDCC10C499645E6,
 				BEB35C6173793C1CB7AB6311,
-				1B00957D2190CF28CF03E304,
 				BA58B49B820A47F6F55CDACB,
 				930E58E13FC92BF70AC20EEF,
 				2F1812B26076D9CC1495D452,
@@ -1854,6 +1853,7 @@
 				FE6E3F911679B0D7547577A3,
 				8BCE60CBC91DBAAB089958A1,
 				3F11593DC3A168A52FCC2DD9,
+				FC2C82760E717788B5A6E691,
 				AB0F3F5A622CBB251F64945A,
 				AD495FA1991295C722B46843 ); name = mac; sourceTree = "<group>"; };
 		64DE2D4534D79E74C40A0DEE = { isa = PBXGroup; children = (
@@ -2344,8 +2344,8 @@
 				C9FB7884928BF0D6140AF881,
 				5C9628DB3E0C0BA8809AE45D,
 				724DA2BCA5ABC5772604C3B4,
-				140FD4605CC549620CC7F44D,
 				035B1F7B1505ABF24455690E,
+				3C71EA297D7418FEBB52F9DD,
 				7A86E411B55E15DA7AF1FE67,
 				BD86381924AE45021246ABA3,
 				306AB64E97A05B800349E7E2,
@@ -2359,7 +2359,6 @@
 				D04EEEC7EAE7C806E95ED41C,
 				7EA440527972D6B7322EC307,
 				CB9FE1DA1AFE5FBA9FF06061,
-				DEDFFA49B5CBF862CD6EDFD4,
 				26454A5DB5BAFD7901F17DA7,
 				F41B46F970BA78762DCE67D1,
 				B7A8CF6F889840BED05C8C27,
@@ -2371,6 +2370,7 @@
 				5E330E219B2D2944BCE95174,
 				275FBC09BE58E708A73B88C1,
 				6DA99BA218FB45568258841C,
+				32F1C95EDEE7722797B8CEE8,
 				029A0E8B44DC17211722677D,
 				4B4E17467BC41E2166549998,
 				9686F29C29D1C26E353DE68A,

Builds/VisualStudio2005/Juce.vcproj

@@ -883,8 +883,8 @@
           <Filter Name="mac">
             <File RelativePath="..\..\src\native\mac\juce_ios_Audio.cpp"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_ios_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_UIViewComponentPeer.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_ios_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
@@ -899,7 +899,6 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_Fonts.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MainMenu.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_mac_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MouseCursor.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeCode.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeIncludes.h"/>
@@ -913,6 +912,7 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_SystemStats.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_Threads.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_WebBrowserComponent.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_MessageQueue.h"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_ObjCHelpers.h"/>
           </Filter>

Builds/VisualStudio2008/Juce.vcproj

@@ -883,8 +883,8 @@
           <Filter Name="mac">
             <File RelativePath="..\..\src\native\mac\juce_ios_Audio.cpp"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_ios_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_UIViewComponentPeer.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_ios_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
@@ -899,7 +899,6 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_Fonts.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MainMenu.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_mac_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MouseCursor.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeCode.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeIncludes.h"/>
@@ -913,6 +912,7 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_SystemStats.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_Threads.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_WebBrowserComponent.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_MessageQueue.h"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_ObjCHelpers.h"/>
           </Filter>

Builds/VisualStudio2008_DLL/Juce.vcproj

@@ -885,8 +885,8 @@
           <Filter Name="mac">
             <File RelativePath="..\..\src\native\mac\juce_ios_Audio.cpp"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_ios_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_ios_UIViewComponentPeer.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_ios_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
@@ -901,7 +901,6 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_Fonts.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MainMenu.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MessageManager.mm"/>
-            <File RelativePath="..\..\src\native\mac\juce_mac_MiscUtilities.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_MouseCursor.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeCode.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_NativeIncludes.h"/>
@@ -915,6 +914,7 @@
             <File RelativePath="..\..\src\native\mac\juce_mac_SystemStats.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_Threads.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_WebBrowserComponent.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_Windowing.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_MessageQueue.h"/>
             <File RelativePath="..\..\src\native\mac\juce_osx_ObjCHelpers.h"/>
           </Filter>

Builds/VisualStudio2010/Juce.vcxproj.filters

@@ -1042,10 +1042,10 @@
     <ClCompile Include="..\..\src\native\mac\juce_ios_MessageManager.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\native\mac\juce_ios_MiscUtilities.mm">
+    <ClCompile Include="..\..\src\native\mac\juce_ios_UIViewComponentPeer.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\native\mac\juce_ios_UIViewComponentPeer.mm">
+    <ClCompile Include="..\..\src\native\mac\juce_ios_Windowing.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\native\mac\juce_mac_AppleRemote.mm">
@@ -1087,9 +1087,6 @@
     <ClCompile Include="..\..\src\native\mac\juce_mac_MessageManager.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\native\mac\juce_mac_MiscUtilities.mm">
-      <Filter>Juce\Source\native\mac</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\native\mac\juce_mac_MouseCursor.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
@@ -1123,6 +1120,9 @@
     <ClCompile Include="..\..\src\native\mac\juce_mac_WebBrowserComponent.mm">
       <Filter>Juce\Source\native\mac</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\native\mac\juce_mac_Windowing.mm">
+      <Filter>Juce\Source\native\mac</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\native\windows\juce_win32_ActiveXComponent.cpp">
       <Filter>Juce\Source\native\windows</Filter>
     </ClCompile>

Builds/iOS/Juce.xcodeproj/project.pbxproj

@@ -281,8 +281,8 @@
 		C9FB7884928BF0D6140AF881 = { isa = PBXBuildFile; fileRef = 9DC2C10B16A645EEB82220D8; };
 		5C9628DB3E0C0BA8809AE45D = { isa = PBXBuildFile; fileRef = EE5F18DF1DED7617C4A41FF3; };
 		724DA2BCA5ABC5772604C3B4 = { isa = PBXBuildFile; fileRef = B2BCE9DDC8F0F54CA3D913E7; };
-		140FD4605CC549620CC7F44D = { isa = PBXBuildFile; fileRef = 562A8671221397C9CAD1BB2A; };
 		035B1F7B1505ABF24455690E = { isa = PBXBuildFile; fileRef = 5249EFBE3B22E6FC1A7B6D42; };
+		3C71EA297D7418FEBB52F9DD = { isa = PBXBuildFile; fileRef = A257B76FCE9D594EAD41414C; };
 		7A86E411B55E15DA7AF1FE67 = { isa = PBXBuildFile; fileRef = 8280AA34B23B4D366711A9E7; };
 		BD86381924AE45021246ABA3 = { isa = PBXBuildFile; fileRef = C9561A66310DAD5EEB4A9462; };
 		306AB64E97A05B800349E7E2 = { isa = PBXBuildFile; fileRef = B62991F8AEE7327BA8A5070F; };
@@ -296,7 +296,6 @@
 		D04EEEC7EAE7C806E95ED41C = { isa = PBXBuildFile; fileRef = 7DB37383434F45D8A7B674C3; };
 		7EA440527972D6B7322EC307 = { isa = PBXBuildFile; fileRef = CB16B2438EDCC10C499645E6; };
 		CB9FE1DA1AFE5FBA9FF06061 = { isa = PBXBuildFile; fileRef = BEB35C6173793C1CB7AB6311; };
-		DEDFFA49B5CBF862CD6EDFD4 = { isa = PBXBuildFile; fileRef = 1B00957D2190CF28CF03E304; };
 		26454A5DB5BAFD7901F17DA7 = { isa = PBXBuildFile; fileRef = BA58B49B820A47F6F55CDACB; };
 		F41B46F970BA78762DCE67D1 = { isa = PBXBuildFile; fileRef = 930E58E13FC92BF70AC20EEF; };
 		B7A8CF6F889840BED05C8C27 = { isa = PBXBuildFile; fileRef = 9113CDD122D2790E147A8CF5; };
@@ -308,6 +307,7 @@
 		5E330E219B2D2944BCE95174 = { isa = PBXBuildFile; fileRef = FE6E3F911679B0D7547577A3; };
 		275FBC09BE58E708A73B88C1 = { isa = PBXBuildFile; fileRef = 8BCE60CBC91DBAAB089958A1; };
 		6DA99BA218FB45568258841C = { isa = PBXBuildFile; fileRef = 3F11593DC3A168A52FCC2DD9; };
+		32F1C95EDEE7722797B8CEE8 = { isa = PBXBuildFile; fileRef = FC2C82760E717788B5A6E691; };
 		029A0E8B44DC17211722677D = { isa = PBXBuildFile; fileRef = 42059626955C547DA6AD3196; };
 		4B4E17467BC41E2166549998 = { isa = PBXBuildFile; fileRef = 8F383A785B4876198C5B0194; };
 		9686F29C29D1C26E353DE68A = { isa = PBXBuildFile; fileRef = F3B50EE3939E9F16D13C3C7C; };
@@ -982,8 +982,8 @@
 		9DC2C10B16A645EEB82220D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../src/native/linux/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		EE5F18DF1DED7617C4A41FF3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ios_Audio.cpp"; path = "../../src/native/mac/juce_ios_Audio.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B2BCE9DDC8F0F54CA3D913E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../src/native/mac/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
-		562A8671221397C9CAD1BB2A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MiscUtilities.mm"; path = "../../src/native/mac/juce_ios_MiscUtilities.mm"; sourceTree = "SOURCE_ROOT"; };
 		5249EFBE3B22E6FC1A7B6D42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_UIViewComponentPeer.mm"; path = "../../src/native/mac/juce_ios_UIViewComponentPeer.mm"; sourceTree = "SOURCE_ROOT"; };
+		A257B76FCE9D594EAD41414C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../src/native/mac/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		8280AA34B23B4D366711A9E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../src/native/mac/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
 		C9561A66310DAD5EEB4A9462 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDBurner.mm"; path = "../../src/native/mac/juce_mac_AudioCDBurner.mm"; sourceTree = "SOURCE_ROOT"; };
 		B62991F8AEE7327BA8A5070F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDReader.mm"; path = "../../src/native/mac/juce_mac_AudioCDReader.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -998,7 +998,6 @@
 		7DB37383434F45D8A7B674C3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Fonts.mm"; path = "../../src/native/mac/juce_mac_Fonts.mm"; sourceTree = "SOURCE_ROOT"; };
 		CB16B2438EDCC10C499645E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../src/native/mac/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		BEB35C6173793C1CB7AB6311 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MessageManager.mm"; path = "../../src/native/mac/juce_mac_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
-		1B00957D2190CF28CF03E304 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MiscUtilities.mm"; path = "../../src/native/mac/juce_mac_MiscUtilities.mm"; sourceTree = "SOURCE_ROOT"; };
 		BA58B49B820A47F6F55CDACB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MouseCursor.mm"; path = "../../src/native/mac/juce_mac_MouseCursor.mm"; sourceTree = "SOURCE_ROOT"; };
 		930E58E13FC92BF70AC20EEF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NativeCode.mm"; path = "../../src/native/mac/juce_mac_NativeCode.mm"; sourceTree = "SOURCE_ROOT"; };
 		2F1812B26076D9CC1495D452 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_NativeIncludes.h"; path = "../../src/native/mac/juce_mac_NativeIncludes.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1012,6 +1011,7 @@
 		FE6E3F911679B0D7547577A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_SystemStats.mm"; path = "../../src/native/mac/juce_mac_SystemStats.mm"; sourceTree = "SOURCE_ROOT"; };
 		8BCE60CBC91DBAAB089958A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Threads.mm"; path = "../../src/native/mac/juce_mac_Threads.mm"; sourceTree = "SOURCE_ROOT"; };
 		3F11593DC3A168A52FCC2DD9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_WebBrowserComponent.mm"; path = "../../src/native/mac/juce_mac_WebBrowserComponent.mm"; sourceTree = "SOURCE_ROOT"; };
+		FC2C82760E717788B5A6E691 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Windowing.mm"; path = "../../src/native/mac/juce_mac_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		AB0F3F5A622CBB251F64945A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_MessageQueue.h"; path = "../../src/native/mac/juce_osx_MessageQueue.h"; sourceTree = "SOURCE_ROOT"; };
 		AD495FA1991295C722B46843 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_osx_ObjCHelpers.h"; path = "../../src/native/mac/juce_osx_ObjCHelpers.h"; sourceTree = "SOURCE_ROOT"; };
 		42059626955C547DA6AD3196 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_ActiveXComponent.cpp"; path = "../../src/native/windows/juce_win32_ActiveXComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1824,8 +1824,8 @@
 		13513EE40AD6BAB30E26C88B = { isa = PBXGroup; children = (
 				EE5F18DF1DED7617C4A41FF3,
 				B2BCE9DDC8F0F54CA3D913E7,
-				562A8671221397C9CAD1BB2A,
 				5249EFBE3B22E6FC1A7B6D42,
+				A257B76FCE9D594EAD41414C,
 				8280AA34B23B4D366711A9E7,
 				C9561A66310DAD5EEB4A9462,
 				B62991F8AEE7327BA8A5070F,
@@ -1840,7 +1840,6 @@
 				7DB37383434F45D8A7B674C3,
 				CB16B2438EDCC10C499645E6,
 				BEB35C6173793C1CB7AB6311,
-				1B00957D2190CF28CF03E304,
 				BA58B49B820A47F6F55CDACB,
 				930E58E13FC92BF70AC20EEF,
 				2F1812B26076D9CC1495D452,
@@ -1854,6 +1853,7 @@
 				FE6E3F911679B0D7547577A3,
 				8BCE60CBC91DBAAB089958A1,
 				3F11593DC3A168A52FCC2DD9,
+				FC2C82760E717788B5A6E691,
 				AB0F3F5A622CBB251F64945A,
 				AD495FA1991295C722B46843 ); name = mac; sourceTree = "<group>"; };
 		64DE2D4534D79E74C40A0DEE = { isa = PBXGroup; children = (
@@ -2348,8 +2348,8 @@
 				C9FB7884928BF0D6140AF881,
 				5C9628DB3E0C0BA8809AE45D,
 				724DA2BCA5ABC5772604C3B4,
-				140FD4605CC549620CC7F44D,
 				035B1F7B1505ABF24455690E,
+				3C71EA297D7418FEBB52F9DD,
 				7A86E411B55E15DA7AF1FE67,
 				BD86381924AE45021246ABA3,
 				306AB64E97A05B800349E7E2,
@@ -2363,7 +2363,6 @@
 				D04EEEC7EAE7C806E95ED41C,
 				7EA440527972D6B7322EC307,
 				CB9FE1DA1AFE5FBA9FF06061,
-				DEDFFA49B5CBF862CD6EDFD4,
 				26454A5DB5BAFD7901F17DA7,
 				F41B46F970BA78762DCE67D1,
 				B7A8CF6F889840BED05C8C27,
@@ -2375,6 +2374,7 @@
 				5E330E219B2D2944BCE95174,
 				275FBC09BE58E708A73B88C1,
 				6DA99BA218FB45568258841C,
+				32F1C95EDEE7722797B8CEE8,
 				029A0E8B44DC17211722677D,
 				4B4E17467BC41E2166549998,
 				9686F29C29D1C26E353DE68A,

Juce.jucer

@@ -1346,10 +1346,10 @@
                 file="src/native/mac/juce_ios_Audio.cpp"/>
           <FILE id="XTxdCBen" name="juce_ios_MessageManager.mm" compile="1" resource="0"
                 file="src/native/mac/juce_ios_MessageManager.mm"/>
-          <FILE id="kGVgE6vYV" name="juce_ios_MiscUtilities.mm" compile="1" resource="0"
-                file="src/native/mac/juce_ios_MiscUtilities.mm"/>
           <FILE id="SKGkPpvaz" name="juce_ios_UIViewComponentPeer.mm" compile="1"
                 resource="0" file="src/native/mac/juce_ios_UIViewComponentPeer.mm"/>
+          <FILE id="kGVgE6vYV" name="juce_ios_Windowing.mm" compile="1" resource="0"
+                file="src/native/mac/juce_ios_Windowing.mm"/>
           <FILE id="2cnGnB7g9" name="juce_mac_AppleRemote.mm" compile="1" resource="0"
                 file="src/native/mac/juce_mac_AppleRemote.mm"/>
           <FILE id="8rKYGEkhh" name="juce_mac_AudioCDBurner.mm" compile="1" resource="0"
@@ -1378,8 +1378,6 @@
                 file="src/native/mac/juce_mac_MainMenu.mm"/>
           <FILE id="g8rCLjth" name="juce_mac_MessageManager.mm" compile="1" resource="0"
                 file="src/native/mac/juce_mac_MessageManager.mm"/>
-          <FILE id="dLoEmsdfl" name="juce_mac_MiscUtilities.mm" compile="1" resource="0"
-                file="src/native/mac/juce_mac_MiscUtilities.mm"/>
           <FILE id="84ADkew8H" name="juce_mac_MouseCursor.mm" compile="1" resource="0"
                 file="src/native/mac/juce_mac_MouseCursor.mm"/>
           <FILE id="FCbPaX" name="juce_mac_NativeCode.mm" compile="1" resource="0"
@@ -1406,6 +1404,8 @@
                 file="src/native/mac/juce_mac_Threads.mm"/>
           <FILE id="ZV5RUI3V" name="juce_mac_WebBrowserComponent.mm" compile="1"
                 resource="0" file="src/native/mac/juce_mac_WebBrowserComponent.mm"/>
+          <FILE id="dLoEmsdfl" name="juce_mac_Windowing.mm" compile="1" resource="0"
+                file="src/native/mac/juce_mac_Windowing.mm"/>
           <FILE id="Gc7s3v" name="juce_osx_MessageQueue.h" compile="0" resource="0"
                 file="src/native/mac/juce_osx_MessageQueue.h"/>
           <FILE id="ffVfA" name="juce_osx_ObjCHelpers.h" compile="0" resource="0"

extras/Introjucer/Source/Application/jucer_MainWindow.cpp

@@ -232,6 +232,10 @@ void MainWindow::activeWindowStatusChanged()
 void MainWindow::updateTitle (const String& documentName)
 {
     String name (JUCEApplication::getInstance()->getApplicationName());
+
+    if (currentProject != nullptr)
+        name = currentProject->getDocumentTitle() + " - " + name;
+
     if (documentName.isNotEmpty())
         name = documentName + " - " + name;
 

extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp

@@ -308,7 +308,9 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
         if (project != nullptr)
         {
             ScopedPointer <ProjectExporter> exporter (ProjectExporter::createPlatformDefaultExporter (*project));
-            exporter->launchProject();
+
+            if (exporter != nullptr)
+                exporter->launchProject();
         }
         break;
 
@@ -316,7 +318,9 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
         if (project != nullptr && project->save (true, true) == FileBasedDocument::savedOk)
         {
             ScopedPointer <ProjectExporter> exporter (ProjectExporter::createPlatformDefaultExporter (*project));
-            exporter->launchProject();
+
+            if (exporter != nullptr)
+                exporter->launchProject();
         }
         break;
 

extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h

@@ -65,13 +65,13 @@ public:
     }
 
     //==============================================================================
-    bool isDefaultFormatForCurrentOS()
+    int getLaunchPreferenceOrderForCurrentOS()
     {
-      #if JUCE_ANDROID
-        return true;
-      #else
-        return false;
-      #endif
+       #if JUCE_ANDROID
+        return 1;
+       #else
+        return 0;
+       #endif
     }
 
     bool isPossibleForCurrentProject()          { return project.isGUIApplication(); }

extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h

@@ -431,13 +431,13 @@ public:
 
     void launchProject()                            { getSLNFile().startAsProcess(); }
 
-    bool isDefaultFormatForCurrentOS()
+    int getLaunchPreferenceOrderForCurrentOS()
     {
-      #if JUCE_WINDOWS
-        return true;
-      #else
-        return false;
-      #endif
+       #if JUCE_WINDOWS
+        return 4;
+       #else
+        return 0;
+       #endif
     }
 
     static MSVCProjectExporterVC2008* createForSettings (Project& project, const ValueTree& settings)
@@ -785,7 +785,14 @@ public:
     static const char* getName()                    { return "Visual Studio 2005"; }
     static const char* getValueTreeTypeName()       { return "VS2005"; }
 
-    bool isDefaultFormatForCurrentOS()              { return false; }
+    int getLaunchPreferenceOrderForCurrentOS()
+    {
+       #if JUCE_WINDOWS
+        return 2;
+       #else
+        return 0;
+       #endif
+    }
 
     static MSVCProjectExporterVC2005* createForSettings (Project& project, const ValueTree& settings)
     {
@@ -817,7 +824,15 @@ public:
     static const char* getName()                   { return "Visual C++ 6.0"; }
     static const char* getValueTreeTypeName()      { return "MSVC6"; }
 
-    bool isDefaultFormatForCurrentOS()              { return false; }
+    int getLaunchPreferenceOrderForCurrentOS()
+    {
+       #if JUCE_WINDOWS
+        return 1;
+       #else
+        return 0;
+       #endif
+    }
+
     void launchProject()                            { getDSWFile().startAsProcess(); }
 
     static MSVCProjectExporterVC6* createForSettings (Project& project, const ValueTree& settings)
@@ -1078,7 +1093,15 @@ public:
     static const char* getName()                    { return "Visual Studio 2010"; }
     static const char* getValueTreeTypeName()       { return "VS2010"; }
 
-    bool isDefaultFormatForCurrentOS()              { return false; }
+    int getLaunchPreferenceOrderForCurrentOS()
+    {
+       #if JUCE_WINDOWS
+        return 3;
+       #else
+        return 0;
+       #endif
+    }
+
     void launchProject()                            { getSLNFile().startAsProcess(); }
 
     static MSVCProjectExporterVC2010* createForSettings (Project& project, const ValueTree& settings)
@@ -1235,63 +1258,77 @@ protected:
             XmlElement* group = projectXml.createNewChildElement ("ItemDefinitionGroup");
             setConditionAttribute (*group, config);
 
-            XmlElement* midl = group->createNewChildElement ("Midl");
-            midl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (isDebug ? "_DEBUG;%(PreprocessorDefinitions)"
-                                                                                             : "NDEBUG;%(PreprocessorDefinitions)");
-            midl->createNewChildElement ("MkTypLibCompatible")->addTextElement ("true");
-            midl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
-            midl->createNewChildElement ("TargetEnvironment")->addTextElement ("Win32");
-            //midl->createNewChildElement ("TypeLibraryName")->addTextElement ("");
-            midl->createNewChildElement ("HeaderFileName");
-
-            XmlElement* cl = group->createNewChildElement ("ClCompile");
-            cl->createNewChildElement ("Optimization")->addTextElement (isDebug ? "Disabled" : "MaxSpeed");
+            {
+                XmlElement* midl = group->createNewChildElement ("Midl");
+                midl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (isDebug ? "_DEBUG;%(PreprocessorDefinitions)"
+                                                                                                 : "NDEBUG;%(PreprocessorDefinitions)");
+                midl->createNewChildElement ("MkTypLibCompatible")->addTextElement ("true");
+                midl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
+                midl->createNewChildElement ("TargetEnvironment")->addTextElement ("Win32");
+                //midl->createNewChildElement ("TypeLibraryName")->addTextElement ("");
+                midl->createNewChildElement ("HeaderFileName");
+            }
 
-            if (isDebug)
-                cl->createNewChildElement ("DebugInformationFormat")->addTextElement ("EditAndContinue");
-
-            StringArray includePaths (getHeaderSearchPaths (config));
-            includePaths.add ("%(AdditionalIncludeDirectories)");
-            cl->createNewChildElement ("AdditionalIncludeDirectories")->addTextElement (includePaths.joinIntoString (";"));
-            cl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (getPreprocessorDefs (config, ";") + ";%(PreprocessorDefinitions)");
-            cl->createNewChildElement ("RuntimeLibrary")->addTextElement (isRTAS() ? (isDebug ? "MultiThreadedDLLDebug" : "MultiThreadedDLL")
-                                                                                   : (isDebug ? "MultiThreadedDebug" : "MultiThreaded"));
-            cl->createNewChildElement ("RuntimeTypeInfo")->addTextElement ("true");
-            cl->createNewChildElement ("PrecompiledHeader");
-            cl->createNewChildElement ("AssemblerListingLocation")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
-            cl->createNewChildElement ("ObjectFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
-            cl->createNewChildElement ("ProgramDataBaseFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
-            cl->createNewChildElement ("WarningLevel")->addTextElement ("Level4");
-            cl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
-
-            XmlElement* res = group->createNewChildElement ("ResourceCompile");
-            res->createNewChildElement ("PreprocessorDefinitions")->addTextElement (isDebug ? "_DEBUG;%(PreprocessorDefinitions)"
-                                                                                            : "NDEBUG;%(PreprocessorDefinitions)");
-
-            XmlElement* link = group->createNewChildElement ("Link");
-            link->createNewChildElement ("OutputFile")->addTextElement (FileHelpers::windowsStylePath (binariesPath + "/" + outputFileName));
-            link->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
-            link->createNewChildElement ("IgnoreSpecificDefaultLibraries")->addTextElement (isDebug ? "libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries)"
-                                                                                                    : "%(IgnoreSpecificDefaultLibraries)");
-            link->createNewChildElement ("GenerateDebugInformation")->addTextElement (isDebug ? "true" : "false");
-            link->createNewChildElement ("ProgramDatabaseFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pdb"));
-            link->createNewChildElement ("SubSystem")->addTextElement (project.isCommandLineApp() ? "Console" : "Windows");
-            link->createNewChildElement ("TargetMachine")->addTextElement ("MachineX86");
+            {
+                XmlElement* cl = group->createNewChildElement ("ClCompile");
+                cl->createNewChildElement ("Optimization")->addTextElement (isDebug ? "Disabled" : "MaxSpeed");
+
+                if (isDebug)
+                    cl->createNewChildElement ("DebugInformationFormat")->addTextElement ("EditAndContinue");
+
+                StringArray includePaths (getHeaderSearchPaths (config));
+                includePaths.add ("%(AdditionalIncludeDirectories)");
+                cl->createNewChildElement ("AdditionalIncludeDirectories")->addTextElement (includePaths.joinIntoString (";"));
+                cl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (getPreprocessorDefs (config, ";") + ";%(PreprocessorDefinitions)");
+                cl->createNewChildElement ("RuntimeLibrary")->addTextElement (isRTAS() ? (isDebug ? "MultiThreadedDLLDebug" : "MultiThreadedDLL")
+                                                                                       : (isDebug ? "MultiThreadedDebug" : "MultiThreaded"));
+                cl->createNewChildElement ("RuntimeTypeInfo")->addTextElement ("true");
+                cl->createNewChildElement ("PrecompiledHeader");
+                cl->createNewChildElement ("AssemblerListingLocation")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
+                cl->createNewChildElement ("ObjectFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
+                cl->createNewChildElement ("ProgramDataBaseFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
+                cl->createNewChildElement ("WarningLevel")->addTextElement ("Level4");
+                cl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
+
+                const String extraFlags (replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim());
+                if (extraFlags.isNotEmpty())
+                    cl->createNewChildElement ("AdditionalOptions")->addTextElement (extraFlags + " %(AdditionalOptions)");
+            }
 
-            if (! isDebug)
             {
-                link->createNewChildElement ("OptimizeReferences")->addTextElement ("true");
-                link->createNewChildElement ("EnableCOMDATFolding")->addTextElement ("true");
+                XmlElement* res = group->createNewChildElement ("ResourceCompile");
+                res->createNewChildElement ("PreprocessorDefinitions")->addTextElement (isDebug ? "_DEBUG;%(PreprocessorDefinitions)"
+                                                                                                : "NDEBUG;%(PreprocessorDefinitions)");
             }
 
-            String extraLinkerOptions (getExtraLinkerFlags().toString());
-            if (extraLinkerOptions.isNotEmpty())
-                link->createNewChildElement ("AdditionalOptions")->addTextElement (replacePreprocessorTokens (config, extraLinkerOptions).trim()
-                                                                                     + " %(AdditionalOptions)");
+            {
+                XmlElement* link = group->createNewChildElement ("Link");
+                link->createNewChildElement ("OutputFile")->addTextElement (FileHelpers::windowsStylePath (binariesPath + "/" + outputFileName));
+                link->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
+                link->createNewChildElement ("IgnoreSpecificDefaultLibraries")->addTextElement (isDebug ? "libcmt.lib; msvcrt.lib;;%(IgnoreSpecificDefaultLibraries)"
+                                                                                                        : "%(IgnoreSpecificDefaultLibraries)");
+                link->createNewChildElement ("GenerateDebugInformation")->addTextElement (isDebug ? "true" : "false");
+                link->createNewChildElement ("ProgramDatabaseFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pdb"));
+                link->createNewChildElement ("SubSystem")->addTextElement (project.isCommandLineApp() ? "Console" : "Windows");
+                link->createNewChildElement ("TargetMachine")->addTextElement ("MachineX86");
+
+                if (! isDebug)
+                {
+                    link->createNewChildElement ("OptimizeReferences")->addTextElement ("true");
+                    link->createNewChildElement ("EnableCOMDATFolding")->addTextElement ("true");
+                }
+
+                String extraLinkerOptions (getExtraLinkerFlags().toString());
+                if (extraLinkerOptions.isNotEmpty())
+                    link->createNewChildElement ("AdditionalOptions")->addTextElement (replacePreprocessorTokens (config, extraLinkerOptions).trim()
+                                                                                         + " %(AdditionalOptions)");
+            }
 
-            XmlElement* bsc = group->createNewChildElement ("Bscmake");
-            bsc->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
-            bsc->createNewChildElement ("OutputFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".bsc"));
+            {
+                XmlElement* bsc = group->createNewChildElement ("Bscmake");
+                bsc->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
+                bsc->createNewChildElement ("OutputFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".bsc"));
+            }
         }
 
         {
@@ -1332,12 +1369,9 @@ protected:
 
     const String getProjectType() const
     {
-        if (project.isGUIApplication() || project.isCommandLineApp())
-            return "Application";
-        else if (project.isAudioPlugin() || project.isBrowserPlugin())
-            return "DynamicLibrary";
-        else if (project.isLibrary())
-            return "StaticLibrary";
+        if (project.isGUIApplication() || project.isCommandLineApp())   return "Application";
+        else if (project.isAudioPlugin() || project.isBrowserPlugin())  return "DynamicLibrary";
+        else if (project.isLibrary())                                   return "StaticLibrary";
 
         jassertfalse;
         return String::empty;

extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h

@@ -60,13 +60,13 @@ public:
     }
 
     //==============================================================================
-    bool isDefaultFormatForCurrentOS()
+    int getLaunchPreferenceOrderForCurrentOS()
     {
-      #if JUCE_LINUX
-        return true;
-      #else
-        return false;
-      #endif
+       #if JUCE_LINUX
+        return 1;
+       #else
+        return 0;
+       #endif
     }
 
     bool isPossibleForCurrentProject()          { return true; }

extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h

@@ -73,13 +73,22 @@ public:
     //==============================================================================
     Value getObjCSuffix()       { return getSetting ("objCExtraSuffix"); }
 
-    bool isDefaultFormatForCurrentOS()
+    int getLaunchPreferenceOrderForCurrentOS()
     {
-      #if JUCE_MAC
-        return ! iPhone;
-      #else
+       #if JUCE_MAC
+        return iPhone ? 1 : 2;
+       #else
+        return 0;
+       #endif
+    }
+
+    bool isAvailableOnCurrentOS()
+    {
+       #if JUCE_MAC
+        return true;
+       #else
         return false;
-      #endif
+       #endif
     }
 
     bool isPossibleForCurrentProject()      { return project.isGUIApplication() || ! iPhone; }

extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp

@@ -104,15 +104,23 @@ ProjectExporter* ProjectExporter::createExporter (Project& project, const ValueT
 
 ProjectExporter* ProjectExporter::createPlatformDefaultExporter (Project& project)
 {
+    ScopedPointer <ProjectExporter> best;
+    int bestPref = 0;
+
     for (int i = 0; i < project.getNumExporters(); ++i)
     {
         ScopedPointer <ProjectExporter> exp (project.createExporter (i));
 
-        if (exp->isDefaultFormatForCurrentOS())
-            return exp.release();
+        const int pref = exp->getLaunchPreferenceOrderForCurrentOS();
+
+        if (pref > bestPref)
+        {
+            bestPref = pref;
+            best = exp;
+        }
     }
 
-    return 0;
+    return best.release();
 }
 
 const File ProjectExporter::getTargetFolder() const

extras/Introjucer/Source/Project/jucer_ProjectExporter.h

@@ -48,7 +48,8 @@ public:
     static ProjectExporter* createPlatformDefaultExporter (Project& project);
 
     //=============================================================================
-    virtual bool isDefaultFormatForCurrentOS() = 0;
+    // return 0 if this can't be opened in the current OS, or a higher value, where higher numbers are more preferable.
+    virtual int getLaunchPreferenceOrderForCurrentOS() = 0;
     virtual bool isPossibleForCurrentProject() = 0;
     virtual bool usesMMFiles() const = 0;
     virtual void createPropertyEditors (Array <PropertyComponent*>& props);

extras/JuceDemo/Source/demos/WidgetsDemo.cpp

@@ -1204,7 +1204,7 @@ public:
             demoComponent->performDemoMenuItem (result);
     }
 
-    static void alertBoxResultChosen (int result, WidgetsDemo* demoComponent)
+    static void alertBoxResultChosen (int result, WidgetsDemo*)
     {
         AlertWindow::showMessageBoxAsync (AlertWindow::InfoIcon,
                                           "Alert Box",

juce_amalgamated.h

@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  54
-#define JUCE_BUILDNUMBER	8
+#define JUCE_BUILDNUMBER	9
 
 /** Current Juce version number.
 

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      54
-#define JUCE_BUILDNUMBER        8
+#define JUCE_BUILDNUMBER        9
 
 /** Current Juce version number.
 

src/native/mac/juce_ios_MessageManager.mm

@@ -27,6 +27,43 @@
 // compiled on its own).
 #if JUCE_INCLUDED_FILE
 
+//==============================================================================
+END_JUCE_NAMESPACE
+
+@interface JuceAppStartupDelegate : NSObject <UIApplicationDelegate>
+{
+}
+
+- (void) applicationDidFinishLaunching: (UIApplication*) application;
+- (void) applicationWillTerminate: (UIApplication*) application;
+
+@end
+
+@implementation JuceAppStartupDelegate
+
+- (void) applicationDidFinishLaunching: (UIApplication*) application
+{
+    initialiseJuce_GUI();
+
+    if (! JUCEApplication::createInstance()->initialiseApp (String::empty))
+        exit (0);
+}
+
+- (void) applicationWillTerminate: (UIApplication*) application
+{
+    JUCEApplication::appWillTerminateByForce();
+}
+
+@end
+
+BEGIN_JUCE_NAMESPACE
+
+int juce_iOSMain (int argc, const char* argv[])
+{
+    return UIApplicationMain (argc, const_cast<char**> (argv), nil, @"JuceAppStartupDelegate");
+}
+
+//==============================================================================
 struct CallbackMessagePayload
 {
     MessageCallbackFunction* function;

src/native/mac/juce_ios_UIViewComponentPeer.mm

@@ -1004,64 +1004,6 @@ ComponentPeer* Component::createNewPeer (int styleFlags, void* windowToAttachTo)
     return new UIViewComponentPeer (this, styleFlags, (UIView*) windowToAttachTo);
 }
 
-//==============================================================================
-Image juce_createIconForFile (const File& file)
-{
-    return Image::null;
-}
-
-//==============================================================================
-void SystemClipboard::copyTextToClipboard (const String& text)
-{
-    [[UIPasteboard generalPasteboard] setValue: juceStringToNS (text)
-                             forPasteboardType: @"public.text"];
-}
-
-String SystemClipboard::getTextFromClipboard()
-{
-    NSString* text = [[UIPasteboard generalPasteboard] valueForPasteboardType: @"public.text"];
-
-    return text == nil ? String::empty
-                       : nsStringToJuce (text);
-}
-
-//==============================================================================
-void Desktop::createMouseInputSources()
-{
-    for (int i = 0; i < 10; ++i)
-        mouseSources.add (new MouseInputSource (i, false));
-}
-
-bool Desktop::canUseSemiTransparentWindows() noexcept
-{
-    return true;
-}
-
-const Point<int> MouseInputSource::getCurrentMousePosition()
-{
-    return juce_lastMousePos;
-}
-
-void Desktop::setMousePosition (const Point<int>&)
-{
-}
-
-Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
-{
-    return convertToJuceOrientation ([[UIApplication sharedApplication] statusBarOrientation]);
-}
-
-void Desktop::getCurrentMonitorPositions (Array <Rectangle <int> >& monitorCoords, const bool clipToWorkArea)
-{
-    JUCE_AUTORELEASEPOOL
-    monitorCoords.clear();
-
-    CGRect r = clipToWorkArea ? [[UIScreen mainScreen] applicationFrame]
-                              : [[UIScreen mainScreen] bounds];
-
-    monitorCoords.add (UIViewComponentPeer::realScreenPosToRotated (convertToRectInt (r)));
-}
-
 //==============================================================================
 const int KeyPress::spaceKey        = ' ';
 const int KeyPress::returnKey       = 0x0d;

src/native/mac/juce_ios_MiscUtilities.mm → src/native/mac/juce_ios_Windowing.mm

@@ -28,53 +28,6 @@
 #if JUCE_INCLUDED_FILE
 
 
-//==============================================================================
-END_JUCE_NAMESPACE
-
-@interface JuceAppStartupDelegate : NSObject <UIApplicationDelegate>
-{
-}
-
-- (void) applicationDidFinishLaunching: (UIApplication*) application;
-- (void) applicationWillTerminate: (UIApplication*) application;
-
-@end
-
-@implementation JuceAppStartupDelegate
-
-- (void) applicationDidFinishLaunching: (UIApplication*) application
-{
-    initialiseJuce_GUI();
-
-    if (! JUCEApplication::createInstance()->initialiseApp (String::empty))
-        exit (0);
-}
-
-- (void) applicationWillTerminate: (UIApplication*) application
-{
-    JUCEApplication::appWillTerminateByForce();
-}
-
-@end
-
-BEGIN_JUCE_NAMESPACE
-
-int juce_iOSMain (int argc, const char* argv[])
-{
-    return UIApplicationMain (argc, const_cast<char**> (argv), nil, @"JuceAppStartupDelegate");
-}
-
-//==============================================================================
-ScopedAutoReleasePool::ScopedAutoReleasePool()
-{
-    pool = [[NSAutoreleasePool alloc] init];
-}
-
-ScopedAutoReleasePool::~ScopedAutoReleasePool()
-{
-    [((NSAutoreleasePool*) pool) release];
-}
-
 //==============================================================================
 void LookAndFeel::playAlertSound()
 {
@@ -82,9 +35,6 @@ void LookAndFeel::playAlertSound()
     //AudioServicesPlaySystemSound ();
 }
 
-//==============================================================================
-#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
-
 //==============================================================================
 class iOSMessageBox;
 
@@ -245,7 +195,62 @@ bool Desktop::isScreenSaverEnabled()
     return ! [[UIApplication sharedApplication] isIdleTimerDisabled];
 }
 
+//==============================================================================
+Image juce_createIconForFile (const File& file)
+{
+    return Image::null;
+}
 
-#endif
+//==============================================================================
+void SystemClipboard::copyTextToClipboard (const String& text)
+{
+    [[UIPasteboard generalPasteboard] setValue: juceStringToNS (text)
+                             forPasteboardType: @"public.text"];
+}
+
+String SystemClipboard::getTextFromClipboard()
+{
+    NSString* text = [[UIPasteboard generalPasteboard] valueForPasteboardType: @"public.text"];
+
+    return text == nil ? String::empty
+                       : nsStringToJuce (text);
+}
+
+//==============================================================================
+void Desktop::createMouseInputSources()
+{
+    for (int i = 0; i < 10; ++i)
+        mouseSources.add (new MouseInputSource (i, false));
+}
+
+bool Desktop::canUseSemiTransparentWindows() noexcept
+{
+    return true;
+}
+
+const Point<int> MouseInputSource::getCurrentMousePosition()
+{
+    return juce_lastMousePos;
+}
+
+void Desktop::setMousePosition (const Point<int>&)
+{
+}
+
+Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
+{
+    return convertToJuceOrientation ([[UIApplication sharedApplication] statusBarOrientation]);
+}
+
+void Desktop::getCurrentMonitorPositions (Array <Rectangle <int> >& monitorCoords, const bool clipToWorkArea)
+{
+    JUCE_AUTORELEASEPOOL
+    monitorCoords.clear();
+
+    CGRect r = clipToWorkArea ? [[UIScreen mainScreen] applicationFrame]
+                              : [[UIScreen mainScreen] bounds];
+
+    monitorCoords.add (UIViewComponentPeer::realScreenPosToRotated (convertToRectInt (r)));
+}
 
 #endif

src/native/mac/juce_mac_NSViewComponentPeer.mm

@@ -1719,46 +1719,6 @@ ComponentPeer* Component::createNewPeer (int styleFlags, void* windowToAttachTo)
     return new NSViewComponentPeer (this, styleFlags, (NSView*) windowToAttachTo);
 }
 
-//==============================================================================
-Image juce_createIconForFile (const File& file)
-{
-    JUCE_AUTORELEASEPOOL
-
-    NSImage* image = [[NSWorkspace sharedWorkspace] iconForFile: juceStringToNS (file.getFullPathName())];
-
-    CoreGraphicsImage* result = new CoreGraphicsImage (Image::ARGB, (int) [image size].width, (int) [image size].height, true);
-
-    [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithGraphicsPort: result->context flipped: false]];
-
-    [image drawAtPoint: NSMakePoint (0, 0)
-              fromRect: NSMakeRect (0, 0, [image size].width, [image size].height)
-             operation: NSCompositeSourceOver fraction: 1.0f];
-
-    [[NSGraphicsContext currentContext] flushGraphics];
-    [NSGraphicsContext restoreGraphicsState];
-
-    return Image (result);
-}
-
-//==============================================================================
-void SystemClipboard::copyTextToClipboard (const String& text)
-{
-    [[NSPasteboard generalPasteboard] declareTypes: [NSArray arrayWithObject: NSStringPboardType]
-                                             owner: nil];
-
-    [[NSPasteboard generalPasteboard] setString: juceStringToNS (text)
-                                        forType: NSStringPboardType];
-}
-
-String SystemClipboard::getTextFromClipboard()
-{
-    NSString* text = [[NSPasteboard generalPasteboard] stringForType: NSStringPboardType];
-
-    return text == nil ? String::empty
-                       : nsStringToJuce (text);
-}
-
 //==============================================================================
 const int KeyPress::spaceKey        = ' ';
 const int KeyPress::returnKey       = 0x0d;

src/native/mac/juce_mac_NativeCode.mm

@@ -118,13 +118,6 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_mac_Threads.mm"
 #include "../common/juce_posix_SharedCode.h"
 #include "juce_mac_Files.mm"
-
-#if JUCE_IOS
- #include "juce_ios_MiscUtilities.mm"
-#else
- #include "juce_mac_MiscUtilities.mm"
-#endif
-
 #include "juce_mac_Debugging.mm"
 
 #if ! JUCE_ONLY_BUILD_CORE_LIBRARY
@@ -132,6 +125,7 @@ BEGIN_JUCE_NAMESPACE
   #include "juce_mac_Fonts.mm"
   #include "juce_mac_CoreGraphicsContext.mm"
   #include "juce_ios_UIViewComponentPeer.mm"
+  #include "juce_ios_Windowing.mm"
   #include "juce_ios_MessageManager.mm"
   #include "juce_mac_FileChooser.mm"
   #include "juce_mac_OpenGLComponent.mm"
@@ -143,6 +137,7 @@ BEGIN_JUCE_NAMESPACE
   #include "juce_mac_Fonts.mm" // (must go before juce_mac_CoreGraphicsContext.mm)
   #include "juce_mac_CoreGraphicsContext.mm"
   #include "juce_mac_NSViewComponentPeer.mm"
+  #include "juce_mac_Windowing.mm"
   #include "juce_mac_MouseCursor.mm"
   #include "juce_mac_NSViewComponent.mm"
   #include "juce_mac_AppleRemote.mm"

src/native/mac/juce_mac_MiscUtilities.mm → src/native/mac/juce_mac_Windowing.mm

@@ -28,26 +28,12 @@
 #if JUCE_INCLUDED_FILE
 
 
-//==============================================================================
-ScopedAutoReleasePool::ScopedAutoReleasePool()
-{
-    pool = [[NSAutoreleasePool alloc] init];
-}
-
-ScopedAutoReleasePool::~ScopedAutoReleasePool()
-{
-    [((NSAutoreleasePool*) pool) release];
-}
-
 //==============================================================================
 void LookAndFeel::playAlertSound()
 {
     NSBeep();
 }
 
-//==============================================================================
-#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
-
 //==============================================================================
 class OSXMessageBox  : public AsyncUpdater
 {
@@ -336,5 +322,46 @@ void Desktop::getCurrentMonitorPositions (Array <Rectangle<int> >& monitorCoords
     jassert (monitorCoords.size() > 0);
 }
 
-#endif
+//==============================================================================
+Image juce_createIconForFile (const File& file)
+{
+    JUCE_AUTORELEASEPOOL
+
+    NSImage* image = [[NSWorkspace sharedWorkspace] iconForFile: juceStringToNS (file.getFullPathName())];
+
+    CoreGraphicsImage* result = new CoreGraphicsImage (Image::ARGB,
+                                                       (int) [image size].width,
+                                                       (int) [image size].height, true);
+
+    [NSGraphicsContext saveGraphicsState];
+    [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithGraphicsPort: result->context flipped: false]];
+
+    [image drawAtPoint: NSMakePoint (0, 0)
+              fromRect: NSMakeRect (0, 0, [image size].width, [image size].height)
+             operation: NSCompositeSourceOver fraction: 1.0f];
+
+    [[NSGraphicsContext currentContext] flushGraphics];
+    [NSGraphicsContext restoreGraphicsState];
+
+    return Image (result);
+}
+
+//==============================================================================
+void SystemClipboard::copyTextToClipboard (const String& text)
+{
+    [[NSPasteboard generalPasteboard] declareTypes: [NSArray arrayWithObject: NSStringPboardType]
+                                             owner: nil];
+
+    [[NSPasteboard generalPasteboard] setString: juceStringToNS (text)
+                                        forType: NSStringPboardType];
+}
+
+String SystemClipboard::getTextFromClipboard()
+{
+    NSString* text = [[NSPasteboard generalPasteboard] stringForType: NSStringPboardType];
+
+    return text == nil ? String::empty
+                       : nsStringToJuce (text);
+}
+
 #endif

src/native/mac/juce_osx_ObjCHelpers.h

@@ -63,5 +63,16 @@ namespace
     }
 }
 
+//==============================================================================
+ScopedAutoReleasePool::ScopedAutoReleasePool()
+{
+    pool = [[NSAutoreleasePool alloc] init];
+}
+
+ScopedAutoReleasePool::~ScopedAutoReleasePool()
+{
+    [((NSAutoreleasePool*) pool) release];
+}
+
 
 #endif   // __JUCE_OSX_OBJCHELPERS_JUCEHEADER__