diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 366eaf5998..c034f1dc8e 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -439,6 +439,7 @@
 		951128CA33CCDEF570436B1C = { isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; };
 		9539EC08D70D4719A89A4A30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_gui_extra.mm"; path = "../../../../modules/juce_gui_extra/juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; };
 		953ECF85818382C60F49544B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AffineTransform.cpp"; path = "../../../../modules/juce_graphics/geometry/juce_AffineTransform.cpp"; sourceTree = "SOURCE_ROOT"; };
+		95CAB4F09E05FDBAED45812E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		96972221C7D4CB0FCD5C3E2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ModalComponentManager.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.cpp"; sourceTree = "SOURCE_ROOT"; };
 		96C105A8CFFC54B429A5B822 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DocumentWindow.h"; path = "../../../../modules/juce_gui_basics/windows/juce_DocumentWindow.h"; sourceTree = "SOURCE_ROOT"; };
 		9718703E5D696761B85D25B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileChooserDialogBox.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1471,6 +1472,7 @@
 				1EC7A8EEAD8ADF43BF014C2C,
 				7D264E60AC701D3736527D8C,
 				A37D773DEFB69C248D703F40,
+				95CAB4F09E05FDBAED45812E,
 				1241F3A1FCDF100CD75D5E78,
 				84444B1D8FCE50BA88CDE7BF,
 				0D100A1B27A72355323CB637 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 829225e903..7f37b9e2a5 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="3"
+            Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3188,6 +3188,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 786c817915..23bb7c735e 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\Introjucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="3"
+            Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3188,6 +3188,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 2cfc469ff2..e88faf2cca 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -1287,6 +1287,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\misc\juce_DropShadower.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Application.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeEditorComponent.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index d6459b0493..6239e304c8 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -2214,6 +2214,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h">
       <Filter>Juce Modules\juce_gui_basics\application</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
+      <Filter>Juce Modules\juce_gui_basics\native</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h">
       <Filter>Juce Modules\juce_gui_basics</Filter>
     </ClInclude>
diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj
index bfc71942ef..b827dc2d31 100644
--- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj	
+++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj	
@@ -173,6 +173,7 @@
 		2275EB468CEA505ADE14C225 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AudioDemoSynthPage.cpp; path = ../../Source/demos/AudioDemoSynthPage.cpp; sourceTree = "SOURCE_ROOT"; };
 		22A86C5C4967A5844323F7BA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DialogWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_DialogWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
 		22C2C932398DC1EFE0880A9A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_OpenGLComponent.cpp"; path = "../../../../modules/juce_opengl/native/juce_android_OpenGLComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		22CD1BF5E83A216A0D18260D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		22DA9E57AAA25391C7D1FBC6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_mac_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
 		2302DFDF103BE152232EA767 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DynamicObject.h"; path = "../../../../modules/juce_core/containers/juce_DynamicObject.h"; sourceTree = "SOURCE_ROOT"; };
 		23189A59169BC89E95A4A496 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentBoundsConstrainer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1779,6 +1780,7 @@
 				F8FB27C3434BB255CED42861,
 				D3AD73A360B24493ECC4E092,
 				5ACCDDBA02C73CE15D6532E9,
+				22CD1BF5E83A216A0D18260D,
 				62AFEF7525003814092C79FA,
 				3E11497CB4E6589C8A10E740,
 				52D9F5FD82C858FE4F134773 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj
index a9d26313a2..e47e49f208 100644
--- a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\JuceDemo.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3922,6 +3922,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj
index b3b9ae6722..b4e4e41172 100644
--- a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\JuceDemo.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3922,6 +3922,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj
index ddcd959bce..f4349c353a 100644
--- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj	
+++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj	
@@ -1552,6 +1552,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\misc\juce_DropShadower.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Application.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeEditorComponent.h"/>
diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters
index b5963fb382..672669dfd6 100644
--- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters	
+++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters	
@@ -2697,6 +2697,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h">
       <Filter>Juce Modules\juce_gui_basics\application</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
+      <Filter>Juce Modules\juce_gui_basics\native</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h">
       <Filter>Juce Modules\juce_gui_basics</Filter>
     </ClInclude>
diff --git a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj
index 5b1dd8e906..1372c9a03a 100644
--- a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj	
+++ b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj	
@@ -165,6 +165,7 @@
 		2275EB468CEA505ADE14C225 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AudioDemoSynthPage.cpp; path = ../../Source/demos/AudioDemoSynthPage.cpp; sourceTree = "SOURCE_ROOT"; };
 		22A86C5C4967A5844323F7BA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DialogWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_DialogWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
 		22C2C932398DC1EFE0880A9A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_OpenGLComponent.cpp"; path = "../../../../modules/juce_opengl/native/juce_android_OpenGLComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		22CD1BF5E83A216A0D18260D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		22DA9E57AAA25391C7D1FBC6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_mac_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
 		2302DFDF103BE152232EA767 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DynamicObject.h"; path = "../../../../modules/juce_core/containers/juce_DynamicObject.h"; sourceTree = "SOURCE_ROOT"; };
 		23189A59169BC89E95A4A496 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentBoundsConstrainer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1769,6 +1770,7 @@
 				F8FB27C3434BB255CED42861,
 				D3AD73A360B24493ECC4E092,
 				5ACCDDBA02C73CE15D6532E9,
+				22CD1BF5E83A216A0D18260D,
 				62AFEF7525003814092C79FA,
 				3E11497CB4E6589C8A10E740,
 				52D9F5FD82C858FE4F134773 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
index e1f1af66fd..8e49024c9c 100644
--- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj	
+++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj	
@@ -104,6 +104,7 @@
 		09E3A8B261601635DF9D9B44 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageFileFormat.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageFileFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0A398AC4D2124027CD618ED0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Timer.h"; path = "../../../../modules/juce_events/timers/juce_Timer.h"; sourceTree = "SOURCE_ROOT"; };
 		0A48C828D9F817F4055CBD07 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadower.cpp"; path = "../../../../modules/juce_gui_basics/misc/juce_DropShadower.cpp"; sourceTree = "SOURCE_ROOT"; };
+		0AF73C2A8497F376EE986AD7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		0B082F614BA025B646A44D8F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MarkerList.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_MarkerList.h"; sourceTree = "SOURCE_ROOT"; };
 		0B23FB9FC547A7877DC3E23E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioThumbnail.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioThumbnail.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0B328D27263540FE58AB0136 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StretchableLayoutResizerBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1696,6 +1697,7 @@
 				44B6E666E32F637DF7823CF2,
 				5A7DAE7A1350D62B224EE51B,
 				8018BB0CE64058FD6D6D6EA6,
+				0AF73C2A8497F376EE986AD7,
 				A7FD436305E19DF69A7AF446,
 				0977400450E451AD1BE80E77,
 				357DC2A5FF7C176B270F1D7B ); name = native; sourceTree = "<group>"; };
diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
index 5a7a176206..ee9eab199b 100644
--- a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj	
+++ b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\JuceDemoPlugin.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
@@ -3859,6 +3859,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
index 4a4a5372d8..d29c65e09c 100644
--- a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj	
+++ b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\JuceDemoPlugin.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
@@ -3859,6 +3859,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj
index f86b4c5c31..7592062567 100644
--- a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj	
+++ b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj	
@@ -61,6 +61,7 @@
 		0452498F0477C7163335153C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0511AF7660ABC3E031579CCC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDeviceSelectorComponent.h"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		057E1EF2AE99025ED2E5E624 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Threads.mm"; path = "../../../../modules/juce_core/native/juce_mac_Threads.mm"; sourceTree = "SOURCE_ROOT"; };
+		05B20BD978297F87BD60E6EC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		0647115F688F4B35C22C0A56 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyMappingEditorComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		06C1447B9CBC6813BB7BEA53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPool.h"; path = "../../../../modules/juce_core/text/juce_StringPool.h"; sourceTree = "SOURCE_ROOT"; };
 		06EB1158FAA7044D25A1B836 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableComposite.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableComposite.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1701,6 +1702,7 @@
 				B723A2D9CFB0222172F8AADF,
 				9887D387B012A8DE67ACE2B4,
 				3726BBA7D42C5E5909D58269,
+				05B20BD978297F87BD60E6EC,
 				2D604FCC59A6A60712AD0D57,
 				C0EAB8DB78CC1330EBFB1BB4,
 				9E6E3468F601EB602900825B ); name = native; sourceTree = "<group>"; };
diff --git a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj
index 7d5dc55d57..181cf71dd9 100644
--- a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj	
+++ b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\Plugin Host.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
@@ -3845,6 +3845,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj
index 302f746141..0ac6d062e0 100644
--- a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj	
+++ b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\Plugin Host.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
@@ -3845,6 +3845,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
index 6494f7ab0b..5818544832 100644
--- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
+++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\BinaryBuilder.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj
index e4bda5d73e..d98ddbbb98 100644
--- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj	
+++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj	
@@ -113,6 +113,7 @@
 		2327E88F48EE9DBD166727F4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BooleanPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		234F4B105DF97B936ED47100 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScrollBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ScrollBar.h"; sourceTree = "SOURCE_ROOT"; };
 		23925ED31BD8E2D82FF86A31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
+		23A21EE368F8679E0C40323B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		23B5C7121187E9533B66FFCB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentListener.h"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.h"; sourceTree = "SOURCE_ROOT"; };
 		2575944C94EF083E2CBDBFA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
 		26341A8D55A799AC0ED8B33F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Random.cpp"; path = "../../../../modules/juce_core/maths/juce_Random.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1256,6 +1257,7 @@
 				E8C858BC5875BA7F76E62B28,
 				895273CAD9B1B37100C11B0F,
 				97BFE20948105F757379B4F8,
+				23A21EE368F8679E0C40323B,
 				07D2814B9A8E25F3269B675D,
 				3705B72C4B467A1EABEC9C49,
 				FE8B93BA3F56CCC0BB37A5C8 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj
index 404a57ea88..8a86525c11 100644
--- a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj	
+++ b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\HelloWorld.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -2916,6 +2916,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj
index ebeb588126..cfa9c1dcd1 100644
--- a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj	
+++ b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\HelloWorld.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -2916,6 +2916,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj
index 46033a2e6c..1b5d476aec 100644
--- a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj	
+++ b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj	
@@ -111,6 +111,7 @@
 		2327E88F48EE9DBD166727F4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BooleanPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		234F4B105DF97B936ED47100 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScrollBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ScrollBar.h"; sourceTree = "SOURCE_ROOT"; };
 		23925ED31BD8E2D82FF86A31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
+		23A21EE368F8679E0C40323B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		23B5C7121187E9533B66FFCB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentListener.h"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.h"; sourceTree = "SOURCE_ROOT"; };
 		2575944C94EF083E2CBDBFA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
 		26341A8D55A799AC0ED8B33F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Random.cpp"; path = "../../../../modules/juce_core/maths/juce_Random.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1254,6 +1255,7 @@
 				E8C858BC5875BA7F76E62B28,
 				895273CAD9B1B37100C11B0F,
 				97BFE20948105F757379B4F8,
+				23A21EE368F8679E0C40323B,
 				07D2814B9A8E25F3269B675D,
 				3705B72C4B467A1EABEC9C49,
 				FE8B93BA3F56CCC0BB37A5C8 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj b/extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj
index cab6af6819..98c7bf18d0 100644
--- a/extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj	
+++ b/extras/static library/Builds/MacOSX/juce.xcodeproj/project.pbxproj	
@@ -561,6 +561,7 @@
 		B1ECF949EA966754FB66C64B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableText.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B1F69F791424FC9C4E34A288 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioFormatManager.cpp"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatManager.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B284B2115E0FD38029E5D939 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileInputSource.h"; path = "../../../../modules/juce_core/streams/juce_FileInputSource.h"; sourceTree = "SOURCE_ROOT"; };
+		B2D51059E467923A404D038B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		B2EEA3875892C49A3C5A3E20 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadowEffect.cpp"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B38EE2659FCA8890708E58A4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_win32_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		B39D532D1E65ED84EAD1992C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ListBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ListBox.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1620,6 +1621,7 @@
 				4972EFB35F46FBAC02F9FA94,
 				CA5DF995ACFC1C7A011450E2,
 				5EDC0271FFCE0FBE21E31146,
+				B2D51059E467923A404D038B,
 				76AB694AEEC8FF5D6DF84ED6,
 				34B304F56DBC8FB53F3257A4,
 				B38EE2659FCA8890708E58A4 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/static library/Builds/VisualStudio2008/juce.vcproj b/extras/static library/Builds/VisualStudio2008/juce.vcproj
index 4c6bfcf5ac..c64e6debf3 100644
--- a/extras/static library/Builds/VisualStudio2008/juce.vcproj	
+++ b/extras/static library/Builds/VisualStudio2008/juce.vcproj	
@@ -65,7 +65,7 @@
       <Tool Name="VCXMLDataGeneratorTool"/>
       <Tool Name="VCWebServiceProxyGeneratorTool"/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3736,6 +3736,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/static library/Builds/VisualStudio2010/juce.vcxproj b/extras/static library/Builds/VisualStudio2010/juce.vcxproj
index ef92c09e99..9fe7e2c341 100644
--- a/extras/static library/Builds/VisualStudio2010/juce.vcxproj	
+++ b/extras/static library/Builds/VisualStudio2010/juce.vcxproj	
@@ -1498,6 +1498,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\misc\juce_DropShadower.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Application.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeEditorComponent.h"/>
diff --git a/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters b/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters
index 5f6248b56d..70439dbfce 100644
--- a/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters	
+++ b/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters	
@@ -2532,6 +2532,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h">
       <Filter>Juce Modules\juce_gui_basics\application</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
+      <Filter>Juce Modules\juce_gui_basics\native</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h">
       <Filter>Juce Modules\juce_gui_basics</Filter>
     </ClInclude>
diff --git a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj
index 56550c1cec..9f56a77aed 100644
--- a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj	
+++ b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj	
@@ -438,6 +438,7 @@
 		852C44541F302ECE66F1369D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CustomTypeface.h"; path = "../../../../modules/juce_graphics/fonts/juce_CustomTypeface.h"; sourceTree = "SOURCE_ROOT"; };
 		854E09D6791FAA63FD774F05 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentLayoutPanel.cpp"; path = "../../src/ui/jucer_ComponentLayoutPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		858CB9B13580398A66685B49 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
+		85C3E577B62AAE4E02295B40 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MultiTouchMapper.h"; path = "../../../../modules/juce_gui_basics/native/juce_MultiTouchMapper.h"; sourceTree = "SOURCE_ROOT"; };
 		866CDAD4E22B3318EEE45621 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentUndoableAction.h"; path = "../../src/model/components/jucer_ComponentUndoableAction.h"; sourceTree = "SOURCE_ROOT"; };
 		86742D778847DB69243EAF2F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_TextButton.h"; sourceTree = "SOURCE_ROOT"; };
 		86C00D9FE681C7318697DBFB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_FillType.cpp"; path = "../../src/model/paintelements/jucer_FillType.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1516,6 +1517,7 @@
 				7F8DDDAFF79F6EBFF60C584A,
 				0542DC47766D750AF3A127B6,
 				7CB38E0FFD17B18E68DB5487,
+				85C3E577B62AAE4E02295B40,
 				116AD9367AFF9F2E2452B6DB,
 				3A889B42A19D28430DBD4480,
 				52B7EC1B24062BEB423D2E44 ); name = native; sourceTree = "<group>"; };
diff --git a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj
index 0316731c63..4cc194bb09 100644
--- a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj	
+++ b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj	
@@ -85,7 +85,7 @@
             TypeLibraryName=".\Release\Jucer.tlb"
             HeaderFileName=""/>
       <Tool Name="VCCLCompilerTool"
-            Optimization="2"
+            Optimization="1"
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories="..\..\JuceLibraryCode"
@@ -3083,6 +3083,7 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_MouseCursor.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_NSViewComponentPeer.mm"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_mac_Windowing.mm"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\native\juce_win32_DragAndDrop.cpp">
             <FileConfiguration Name="Debug|Win32"
                                ExcludedFromBuild="true">
diff --git a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj
index 8148b5dc24..ef3bf1f79c 100644
--- a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj	
+++ b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj	
@@ -1284,6 +1284,7 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\misc\juce_DropShadower.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Application.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeDocument.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\code_editor\juce_CodeEditorComponent.h"/>
diff --git a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters
index 78b3a52df5..0148e6d49e 100644
--- a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters	
+++ b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters	
@@ -2271,6 +2271,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\application\juce_Initialisation.h">
       <Filter>Juce Modules\juce_gui_basics\application</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\native\juce_MultiTouchMapper.h">
+      <Filter>Juce Modules\juce_gui_basics\native</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.h">
       <Filter>Juce Modules\juce_gui_basics</Filter>
     </ClInclude>
diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
index 4512ea7358..4b11803a65 100644
--- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
@@ -1553,14 +1553,10 @@ private:
 
     void handleTouchInput (const TOUCHINPUT& touch, const bool isDown, const bool isUp, bool isCancel)
     {
-        POINT p = { TOUCH_COORD_TO_PIXEL (touch.x),
-                    TOUCH_COORD_TO_PIXEL (touch.y) };
-        ScreenToClient (hwnd, &p);
-
-        const Point<int> pos ((int) p.x, (int) p.y);
-        const int64 time = getMouseEventTime();
         const int touchIndex = currentTouches.getIndexOfTouch (touch.dwID);
-
+        const int64 time = getMouseEventTime();
+        const Point<int> pos (globalToLocal (Point<int> ((int) TOUCH_COORD_TO_PIXEL (touch.x),
+                                                         (int) TOUCH_COORD_TO_PIXEL (touch.y))));
         ModifierKeys modsToSend (currentModifiers);
 
         if (isDown)