Renamed and refactored the LookAndFeel classes. The LookAndFeel class is now an abstract base-class, and there are 3 concrete subclasses you can use. These are LookAndFeel_V1 (replaces OldSchoolLookAndFeel), LookAndFeel_V2 (replaces what was the normal LookAndFeel class) and LookAndFeel_V3 (this is a new style, taken from the Introjucer's L+F).

extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp

@@ -2740,6 +2740,30 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp">
       <Option compile="0"/>
       <Option link="0"/>
@@ -3028,14 +3052,6 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
     <Unit filename="../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h">
       <Option compile="0"/>
       <Option link="0"/>

extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj

@@ -170,6 +170,7 @@
 		1F9BBDFA52513AD34D906D2A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_HyperlinkButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_HyperlinkButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
 		1FA92F8F2B26C6CEC8B1D737 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ButtonDocument.h"; path = "../../Source/ComponentEditor/documents/jucer_ButtonDocument.h"; sourceTree = "SOURCE_ROOT"; };
 		202591AAB1ABCFE458F33F7C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.cpp"; sourceTree = "SOURCE_ROOT"; };
+		203CF0F8F72A516BB1CC5422 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		206D399250A42034706E5434 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.h"; sourceTree = "SOURCE_ROOT"; };
 		20FC504E8FB8D30E890A9837 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChoicePropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		2107C02B684C7F5B75662333 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Registry.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Registry.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -202,7 +203,6 @@
 		263D9041F9B7D6A79DC38CD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentLayoutEditor.h"; path = "../../Source/ComponentEditor/ui/jucer_ComponentLayoutEditor.h"; sourceTree = "SOURCE_ROOT"; };
 		263F153E8A277E02A3754BBF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ToolbarButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		269A454F1FF081DA67FFD578 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_JucerDocument.cpp"; path = "../../Source/ComponentEditor/jucer_JucerDocument.cpp"; sourceTree = "SOURCE_ROOT"; };
-		26C4A38525D6A327C0102D18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		271A1D94B96A8B7C949FD8ED = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentMovementWatcher.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentMovementWatcher.cpp"; sourceTree = "SOURCE_ROOT"; };
 		27A2B025813B7E54E0862642 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_PaintElementUndoableAction.h"; path = "../../Source/ComponentEditor/paintelements/jucer_PaintElementUndoableAction.h"; sourceTree = "SOURCE_ROOT"; };
 		295A9B126C98FE15F5A8B81E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePropertyComponent.h"; path = "../../Source/ComponentEditor/properties/jucer_FilePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -481,11 +481,13 @@
 		83EB0CAD2379BD53DBEB9D0F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Threads.mm"; path = "../../../../modules/juce_core/native/juce_mac_Threads.mm"; sourceTree = "SOURCE_ROOT"; };
 		8427B23B886EDC0E1839D7C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableBorderComponent.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ResizableBorderComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		84444B1D8FCE50BA88CDE7BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_win32_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; };
+		845CE323405ACC3A7E84EEAE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		848D1FD80E9CA20E4977B516 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SHA256.cpp"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.cpp"; sourceTree = "SOURCE_ROOT"; };
 		84AADFD13AF2A6F6F4681051 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Primes.h"; path = "../../../../modules/juce_cryptography/encryption/juce_Primes.h"; sourceTree = "SOURCE_ROOT"; };
 		8575C117887D90BDF84397C3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SubregionStream.h"; path = "../../../../modules/juce_core/streams/juce_SubregionStream.h"; sourceTree = "SOURCE_ROOT"; };
 		859DCE43FF52E0BF3E9E9540 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RelativeCoordinate.h"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeCoordinate.h"; sourceTree = "SOURCE_ROOT"; };
 		863A117E6B25D1FF3AEE8F0F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NotificationType.h"; path = "../../../../modules/juce_events/messages/juce_NotificationType.h"; sourceTree = "SOURCE_ROOT"; };
+		864B6C25114F4416FFAA1838 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		865A30767AAA44DAE7683C8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemStats.h"; path = "../../../../modules/juce_core/system/juce_SystemStats.h"; sourceTree = "SOURCE_ROOT"; };
 		867C3547D1301204924989F9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativePoint.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativePoint.cpp"; sourceTree = "SOURCE_ROOT"; };
 		86DADC3D8463C21DF2751EA6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_UIViewComponent.h"; path = "../../../../modules/juce_gui_extra/embedding/juce_UIViewComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -590,6 +592,7 @@
 		A243C85FC2C37FD73F115E67 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
 		A28743047698F6C02194A218 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ToggleButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToggleButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A2A081D9DA35B3D1F183C3FE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_graphics.mm"; path = "../../../../modules/juce_graphics/juce_graphics.mm"; sourceTree = "SOURCE_ROOT"; };
+		A2FBC2BA5FFB83CFCD61F399 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A37D773DEFB69C248D703F40 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Windowing.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		A3DB226F40C387078864E68A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; };
 		A4422A360A9FB7BCC315BEF4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_CommonFile.cpp"; path = "../../../../modules/juce_core/native/juce_linux_CommonFile.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -673,7 +676,6 @@
 		BDCE974230A7401C0E9D28BB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallOutBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_CallOutBox.h"; sourceTree = "SOURCE_ROOT"; };
 		BDE24BA8FEAE654645079B84 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Variant.cpp"; path = "../../../../modules/juce_core/containers/juce_Variant.cpp"; sourceTree = "SOURCE_ROOT"; };
 		BDEBB0AC32DDA8C16FFE6011 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipClient.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_TooltipClient.h"; sourceTree = "SOURCE_ROOT"; };
-		BE90AA37929461DF6F6A9E13 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		BE97579323E97AF084D41476 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsList.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.cpp"; sourceTree = "SOURCE_ROOT"; };
 		BF171B0762D5550B797869F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Expression.h"; path = "../../../../modules/juce_core/maths/juce_Expression.h"; sourceTree = "SOURCE_ROOT"; };
 		BF3CEF080FA013E2778DCE90 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Project.h"; path = "../../Source/Project/jucer_Project.h"; sourceTree = "SOURCE_ROOT"; };
@@ -756,7 +758,6 @@
 		D926E13AB5AD647A7A00F486 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9342535EA61901A1AD816C6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9B077E2ECDDA94961E134D7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
-		D9E59DE07A815AB303A297D9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
 		DAF84A553D264705FA6EB6FF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeViewHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TreeViewHandler.h"; sourceTree = "SOURCE_ROOT"; };
 		DB876F7873F42DC685A58CA7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DBE0CDE1B017190ABBFF557C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
@@ -774,6 +775,7 @@
 		D87FC8F6834E9DC9C8E88B94 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
 		D92A6E9404A30EED32DCE4ED = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_RelativePositionedRectangle.h"; path = "../../Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h"; sourceTree = "SOURCE_ROOT"; };
 		D95D7B49EC6C6BDCB5A1B988 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
+		D9E59DE07A815AB303A297D9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
 		DA345D5B9DABD049F90DC96F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
 		DB20268A566DABEAE3F2CBEE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DC922C6A65D260C18E888E49 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_ComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -798,6 +800,7 @@
 		E3FF16862AA1B2F943DC616C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E446FFE889CD490FDE3F0F2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadWithProgressWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E4E74B2BC3F3CB5A4F4DC55E = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
+		E4F9D1E097CC2C1D1291823C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E530742870F07704E9616358 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarItemComponent.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E54D0994D31E20A0A05EBA2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemTrayIconComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E570E57CC1FCEF78B54A7084 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
@@ -814,6 +817,7 @@
 		E7E122AE104E79BB641B07B3 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_data_structures/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		E7E1C4F416CFA44BE7DD1A74 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyboardFocusTraverser.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyboardFocusTraverser.h"; sourceTree = "SOURCE_ROOT"; };
 		E7E1D60BC7AEF79AA7B65B7C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_String.cpp"; path = "../../../../modules/juce_core/text/juce_String.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E7F098BA306EC789242AB9A8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E82C9EF1A74D867BBFF2090D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RSAKey.cpp"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E99F5A31373E9BDEAC40792F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_FileChooser.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_FileChooser.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E9B8C3CA480AE94BEA852EA9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -1688,7 +1692,13 @@
 				F994D79D564B5F8D06E6766E ); name = properties; sourceTree = "<group>"; };
 		C2A68B1BEC638D0513BF25C1 = { isa = PBXGroup; children = (
 				9BDE235186FA9648EEECB373,
-				AE84254C46407F84EB70A370 ); name = lookandfeel; sourceTree = "<group>"; };
+				AE84254C46407F84EB70A370,
+				E7F098BA306EC789242AB9A8,
+				864B6C25114F4416FFAA1838,
+				E4F9D1E097CC2C1D1291823C,
+				203CF0F8F72A516BB1CC5422,
+				A2FBC2BA5FFB83CFCD61F399,
+				845CE323405ACC3A7E84EEAE ); name = lookandfeel; sourceTree = "<group>"; };
 		00C2E5EAA46FC2E94B735C42 = { isa = PBXGroup; children = (
 				DE5F3C9EF6BFFDE73AF9E7FC,
 				808503667FBB423F81780796,
@@ -1787,10 +1797,7 @@
 				A1C82396A9A0F9A296AA7E6B,
 				99DD90B64BC5CC5FF68FA0C5,
 				86DADC3D8463C21DF2751EA6 ); name = embedding; sourceTree = "<group>"; };
-		DD35BF639F13CB10E9ACF910 = { isa = PBXGroup; children = (
-				26C4A38525D6A327C0102D18,
-				BE90AA37929461DF6F6A9E13 ); name = lookandfeel; sourceTree = "<group>"; };
-		F50C1ADB9086D61160516CB7 = { isa = PBXGroup; children = (
+		4B54A6F89F9AC7EF540646B4 = { isa = PBXGroup; children = (
 				53DB14312FF9B861739F6747,
 				51D0841BECA0E4405EDEC794,
 				5CB6ACA0F14EDE47A4F7BCC2,
@@ -1807,7 +1814,7 @@
 				F9D77BAA08889D69E0C43F25,
 				E54D0994D31E20A0A05EBA2B,
 				63B74F9D9F43393F6427501C ); name = misc; sourceTree = "<group>"; };
-		4C0BD8F18173E3D675D03872 = { isa = PBXGroup; children = (
+		B09CB33C943D2DE7005C9E75 = { isa = PBXGroup; children = (
 				53704A9E32438DCEFF6A155B,
 				58858190E0EE0AA6955EA236,
 				2E540A9137E245EFADCFABB3,
@@ -1824,9 +1831,8 @@
 				9DEFBE65118D0527555955A2,
 				1D09D8A2B803860D8927C366,
 				A1B124604F7F471E01D8AA6E,
-				DD35BF639F13CB10E9ACF910,
-				F50C1ADB9086D61160516CB7,
-				4C0BD8F18173E3D675D03872,
+				4B54A6F89F9AC7EF540646B4,
+				B09CB33C943D2DE7005C9E75,
 				57FD2D74F5DCFF42099CA738,
 				17C645785FB20AA2E91ED84B ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		8A24D1B6925535A868974986 = { isa = PBXGroup; children = (

extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj

@@ -3203,6 +3203,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -3582,19 +3615,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj

@@ -3203,6 +3203,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -3582,19 +3615,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj

@@ -864,6 +864,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -957,9 +966,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1413,6 +1419,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_SliderPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_TextPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsList.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_FileBrowserComponent.h"/>
@@ -1446,7 +1455,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_ColourSelector.h"/>

extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters

@@ -233,9 +233,6 @@
     <Filter Include="Juce Modules\juce_gui_extra\embedding">
       <UniqueIdentifier>{61B2920C-494D-D8CB-C0C7-5DBF3D76D164}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_gui_extra\lookandfeel">
-      <UniqueIdentifier>{4980B18D-FEDE-B773-F254-E3B5207D81F0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_gui_extra\misc">
       <UniqueIdentifier>{66C9B809-8739-A217-C78D-A15D6089B8E3}</UniqueIdentifier>
     </Filter>
@@ -1093,6 +1090,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClCompile>
@@ -1207,9 +1213,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <Filter>Juce Modules\juce_gui_extra\documents</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClCompile>
@@ -2493,6 +2496,15 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClInclude>
@@ -2592,9 +2604,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h">
       <Filter>Juce Modules\juce_gui_extra\embedding</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClInclude>

extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj

@@ -870,6 +870,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -963,9 +972,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1419,6 +1425,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_SliderPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_TextPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsList.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_FileBrowserComponent.h"/>
@@ -1452,7 +1461,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_ColourSelector.h"/>

extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters

@@ -233,9 +233,6 @@
     <Filter Include="Juce Modules\juce_gui_extra\embedding">
       <UniqueIdentifier>{61B2920C-494D-D8CB-C0C7-5DBF3D76D164}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_gui_extra\lookandfeel">
-      <UniqueIdentifier>{4980B18D-FEDE-B773-F254-E3B5207D81F0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_gui_extra\misc">
       <UniqueIdentifier>{66C9B809-8739-A217-C78D-A15D6089B8E3}</UniqueIdentifier>
     </Filter>
@@ -1093,6 +1090,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClCompile>
@@ -1207,9 +1213,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <Filter>Juce Modules\juce_gui_extra\documents</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClCompile>
@@ -2493,6 +2496,15 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClInclude>
@@ -2592,9 +2604,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h">
       <Filter>Juce Modules\juce_gui_extra\embedding</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClInclude>

extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp

@@ -209,8 +209,7 @@ void AppearanceSettings::applyToLookAndFeel (LookAndFeel& lf) const
         }
     }
 
-    lf.setColour (ScrollBar::thumbColourId,
-                  IntrojucerLookAndFeel::getScrollbarColourForBackground (lf.findColour (mainBackgroundColourId)));
+    lf.setColour (ScrollBar::thumbColourId, lf.findColour (mainBackgroundColourId).contrasting().withAlpha (0.13f));
 }
 
 void AppearanceSettings::applyToCodeEditor (CodeEditorComponent& editor) const
@@ -236,8 +235,9 @@ void AppearanceSettings::applyToCodeEditor (CodeEditorComponent& editor) const
         }
     }
 
-    editor.setColour (ScrollBar::thumbColourId,
-                      IntrojucerLookAndFeel::getScrollbarColourForBackground (editor.findColour (CodeEditorComponent::backgroundColourId)));
+    editor.setColour (ScrollBar::thumbColourId, editor.findColour (CodeEditorComponent::backgroundColourId)
+                                                      .contrasting()
+                                                      .withAlpha (0.13f));
 }
 
 Font AppearanceSettings::getCodeFont() const
@@ -530,44 +530,11 @@ void AppearanceSettings::showEditorWindow (ScopedPointer<Component>& ownerPointe
 IntrojucerLookAndFeel::IntrojucerLookAndFeel()
 {
     setColour (mainBackgroundColourId, Colour::greyLevel (0.8f));
-    setColour (TreeView::selectedItemBackgroundColourId, Colour (0x401111ee));
-    setColour (TextButton::buttonColourId, Colour (0xffeeeeff));
-
-    setColour (ScrollBar::thumbColourId,
-               getScrollbarColourForBackground (findColour (mainBackgroundColourId)));
-}
-
-Colour IntrojucerLookAndFeel::getScrollbarColourForBackground (Colour background)
-{
-    return background.contrasting().withAlpha (0.13f);
-}
-
-Rectangle<int> IntrojucerLookAndFeel::getPropertyComponentContentPosition (PropertyComponent& component)
-{
-    if (component.findParentComponentOfClass<AppearanceEditor::EditorPanel>() != nullptr)
-        return component.getLocalBounds().reduced (1).removeFromRight (component.getWidth() / 2);
-
-    return LookAndFeel::getPropertyComponentContentPosition (component);
 }
 
-int IntrojucerLookAndFeel::getTabButtonOverlap (int /*tabDepth*/)                      { return -1; }
-int IntrojucerLookAndFeel::getTabButtonSpaceAroundImage()                              { return 1; }
-int IntrojucerLookAndFeel::getTabButtonBestWidth (TabBarButton&, int /*tabDepth*/)     { return 120; }
+int IntrojucerLookAndFeel::getTabButtonBestWidth (TabBarButton&, int)   { return 120; }
 
-static void createTabTextLayout (const TabBarButton& button, const Rectangle<int>& textArea,
-                                 const Colour colour, TextLayout& textLayout)
-{
-    Font font (textArea.getHeight() * 0.5f);
-    font.setUnderline (button.hasKeyboardFocus (false));
-
-    AttributedString s;
-    s.setJustification (Justification::centred);
-    s.append (button.getButtonText().trim(), font, colour);
-
-    textLayout.createLayout (s, (float) textArea.getWidth());
-}
-
-Colour IntrojucerLookAndFeel::getTabBackgroundColour (TabBarButton& button)
+static Colour getTabBackgroundColour (TabBarButton& button)
 {
     const Colour bkg (button.findColour (mainBackgroundColourId).contrasting (0.15f));
 
@@ -594,60 +561,11 @@ void IntrojucerLookAndFeel::drawTabButton (TabBarButton& button, Graphics& g, bo
     const Colour col (bkg.contrasting().withMultipliedAlpha (alpha));
 
     TextLayout textLayout;
-    createTabTextLayout (button, button.getTextArea(), col, textLayout);
+    LookAndFeel_V3::createTabTextLayout (button, (float) activeArea.getWidth(), (float) activeArea.getHeight(), col, textLayout);
 
     textLayout.draw (g, button.getTextArea().toFloat());
 }
 
-Rectangle<int> IntrojucerLookAndFeel::getTabButtonExtraComponentBounds (const TabBarButton& button, Rectangle<int>& textArea, Component& comp)
-{
-    TextLayout textLayout;
-    createTabTextLayout (button, textArea, Colours::black, textLayout);
-    const int textWidth = (int) textLayout.getWidth();
-    const int extraSpace = jmax (0, textArea.getWidth() - (textWidth + comp.getWidth())) / 2;
-
-    textArea.removeFromRight (extraSpace);
-    textArea.removeFromLeft (extraSpace);
-    return textArea.removeFromRight (comp.getWidth());
-}
-
-void IntrojucerLookAndFeel::drawStretchableLayoutResizerBar (Graphics& g, int /*w*/, int /*h*/, bool /*isVerticalBar*/, bool isMouseOver, bool isMouseDragging)
-{
-    if (isMouseOver || isMouseDragging)
-        g.fillAll (Colours::yellow.withAlpha (0.4f));
-}
-
-void IntrojucerLookAndFeel::drawScrollbar (Graphics& g, ScrollBar& scrollbar, int x, int y, int width, int height,
-                                           bool isScrollbarVertical, int thumbStartPosition, int thumbSize,
-                                           bool isMouseOver, bool isMouseDown)
-{
-    Path thumbPath;
-
-    if (thumbSize > 0)
-    {
-        const float thumbIndent = (isScrollbarVertical ? width : height) * 0.25f;
-        const float thumbIndentx2 = thumbIndent * 2.0f;
-
-        if (isScrollbarVertical)
-            thumbPath.addRoundedRectangle (x + thumbIndent, thumbStartPosition + thumbIndent,
-                                           width - thumbIndentx2, thumbSize - thumbIndentx2, (width - thumbIndentx2) * 0.5f);
-        else
-            thumbPath.addRoundedRectangle (thumbStartPosition + thumbIndent, y + thumbIndent,
-                                           thumbSize - thumbIndentx2, height - thumbIndentx2, (height - thumbIndentx2) * 0.5f);
-    }
-
-    Colour thumbCol (scrollbar.findColour (ScrollBar::thumbColourId, true));
-
-    if (isMouseOver || isMouseDown)
-        thumbCol = thumbCol.withMultipliedAlpha (2.0f);
-
-    g.setColour (thumbCol);
-    g.fillPath (thumbPath);
-
-    g.setColour (thumbCol.contrasting ((isMouseOver  || isMouseDown) ? 0.2f : 0.1f));
-    g.strokePath (thumbPath, PathStrokeType (1.0f));
-}
-
 static Range<float> getBrightnessRange (const Image& im)
 {
     float minB = 1.0f, maxB = 0;
@@ -705,97 +623,3 @@ void IntrojucerLookAndFeel::fillWithBackgroundTexture (Component& c, Graphics& g
 {
     dynamic_cast<IntrojucerLookAndFeel&> (c.getLookAndFeel()).fillWithBackgroundTexture (g);
 }
-
-void IntrojucerLookAndFeel::drawConcertinaPanelHeader (Graphics& g, const Rectangle<int>& area,
-                                                       bool isMouseOver, bool /*isMouseDown*/,
-                                                       ConcertinaPanel&, Component& panel)
-{
-    const Colour bkg (findColour (mainBackgroundColourId));
-
-    g.setGradientFill (ColourGradient (Colours::white.withAlpha (isMouseOver ? 0.4f : 0.2f), 0, (float) area.getY(),
-                                       Colours::darkgrey.withAlpha (0.2f), 0, (float) area.getBottom(), false));
-
-    g.fillAll();
-    g.setColour (bkg.contrasting().withAlpha (0.04f));
-    g.fillRect (area.withHeight (1));
-    g.fillRect (area.withTop (area.getBottom() - 1));
-
-    g.setColour (bkg.contrasting());
-    g.setFont (Font (area.getHeight() * 0.6f).boldened());
-    g.drawFittedText (panel.getName(), 4, 0, area.getWidth() - 6, area.getHeight(), Justification::centredLeft, 1);
-}
-
-void IntrojucerLookAndFeel::drawButtonBackground (Graphics& g,
-                                                  Button& button,
-                                                  const Colour& backgroundColour,
-                                                  bool isMouseOverButton,
-                                                  bool isButtonDown)
-{
-    const bool flatOnLeft   = button.isConnectedOnLeft();
-    const bool flatOnRight  = button.isConnectedOnRight();
-    const bool flatOnTop    = button.isConnectedOnTop();
-    const bool flatOnBottom = button.isConnectedOnBottom();
-
-    const float width  = (float) button.getWidth();
-    const float height = (float) button.getHeight();
-
-    const float x = 0.5f;
-    const float y = 0.5f;
-    const float w = width  - 1.0f;
-    const float h = height - 1.0f;
-    const float cornerSize = 4.0f;
-
-    Colour baseColour (backgroundColour.withMultipliedSaturation (button.hasKeyboardFocus (true)
-                                                                      ? 1.3f : 0.9f)
-                                       .withMultipliedAlpha (button.isEnabled() ? 0.9f : 0.5f));
-
-    if (isButtonDown)           baseColour = baseColour.contrasting (0.2f);
-    else if (isMouseOverButton) baseColour = baseColour.contrasting (0.1f);
-
-    const float mainBrightness = baseColour.getBrightness();
-    const float mainAlpha = baseColour.getFloatAlpha();
-
-    Path outline;
-    outline.addRoundedRectangle (x, y, w, h, cornerSize, cornerSize,
-                                 ! (flatOnLeft  || flatOnTop),
-                                 ! (flatOnRight || flatOnTop),
-                                 ! (flatOnLeft  || flatOnBottom),
-                                 ! (flatOnRight || flatOnBottom));
-
-    g.setGradientFill (ColourGradient (baseColour.brighter (0.2f), 0.0f, 0.0f,
-                                       baseColour.darker (0.25f), 0.0f, height, false));
-    g.fillPath (outline);
-
-    g.setColour (Colours::white.withAlpha (0.4f * mainAlpha * mainBrightness * mainBrightness));
-    g.strokePath (outline, PathStrokeType (1.0f), AffineTransform::translation (0.0f, 1.0f)
-                                                        .scaled (1.0f, (h - 1.6f) / h));
-
-    g.setColour (Colours::black.withAlpha (0.4f * mainAlpha));
-    g.strokePath (outline, PathStrokeType (1.0f));
-}
-
-void IntrojucerLookAndFeel::drawTableHeaderBackground (Graphics& g, TableHeaderComponent& header)
-{
-    Rectangle<int> r (header.getLocalBounds());
-
-    g.setColour (Colours::black.withAlpha (0.5f));
-    g.fillRect (r.removeFromBottom (1));
-
-    g.setColour (Colours::white.withAlpha (0.6f));
-    g.fillRect (r);
-
-    g.setColour (Colours::black.withAlpha (0.5f));
-
-    for (int i = header.getNumColumns (true); --i >= 0;)
-        g.fillRect (header.getColumnPosition (i).removeFromRight (1));
-}
-
-void IntrojucerLookAndFeel::drawTreeviewPlusMinusBox (Graphics& g, const Rectangle<float>& area,
-                                                      Colour backgroundColour, bool isOpen, bool isMouseOver)
-{
-    Path p;
-    p.addTriangle (0.0f, 0.0f, 1.0f, isOpen ? 0.0f : 0.5f, isOpen ? 0.5f : 0.0f, 1.0f);
-
-    g.setColour (backgroundColour.contrasting().withAlpha (isMouseOver ? 0.5f : 0.3f));
-    g.fillPath (p, p.getTransformToScaleToFit (area.reduced (area.getHeight() / 8), true));
-}

extras/Introjucer/Source/Application/jucer_AppearanceSettings.h

@@ -78,7 +78,7 @@ private:
 };
 
 //==============================================================================
-class IntrojucerLookAndFeel   : public LookAndFeel
+class IntrojucerLookAndFeel   : public LookAndFeel_V3
 {
 public:
     IntrojucerLookAndFeel();
@@ -86,35 +86,10 @@ public:
     void fillWithBackgroundTexture (Graphics&);
     static void fillWithBackgroundTexture (Component&, Graphics&);
 
-    int getTabButtonOverlap (int tabDepth) override;
-    int getTabButtonSpaceAroundImage() override;
-    int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
-    static Colour getTabBackgroundColour (TabBarButton&);
     void drawTabButton (TabBarButton& button, Graphics&, bool isMouseOver, bool isMouseDown) override;
-
-    Rectangle<int> getTabButtonExtraComponentBounds (const TabBarButton&, Rectangle<int>& textArea, Component&) override;
     void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int, int) override {}
 
-    void drawStretchableLayoutResizerBar (Graphics&, int w, int h, bool isVerticalBar, bool isMouseOver, bool isMouseDragging) override;
-    Rectangle<int> getPropertyComponentContentPosition (PropertyComponent&) override;
-
-    bool areScrollbarButtonsVisible() override   { return false; }
-
-    void drawScrollbar (Graphics&, ScrollBar&, int x, int y, int width, int height, bool isScrollbarVertical,
-                        int thumbStartPosition, int thumbSize, bool isMouseOver, bool isMouseDown) override;
-
-    void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>& area, bool isMouseOver, bool isMouseDown,
-                                    ConcertinaPanel&, Component&) override;
-
-    void drawButtonBackground (Graphics&, Button&, const Colour& backgroundColour,
-                               bool isMouseOverButton, bool isButtonDown) override;
-
-    void drawTreeviewPlusMinusBox (Graphics&, const Rectangle<float>& area,
-                                   Colour backgroundColour, bool isOpen, bool isMouseOver) override;
-
-    void drawTableHeaderBackground (Graphics&, TableHeaderComponent&) override;
-
-    static Colour getScrollbarColourForBackground (Colour background);
+    int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
 
 private:
     Image backgroundTexture;

extras/Introjucer/Source/ComponentEditor/ui/jucer_EditingPanelBase.h

@@ -67,7 +67,7 @@ public:
 
 protected:
     JucerDocument& document;
-    LookAndFeel lookAndFeel;
+    LookAndFeel_V2 lookAndFeel;
 
     Viewport* viewport;
     MagnifierComponent* magnifier;

extras/Introjucer/Source/ComponentEditor/ui/jucer_TestComponent.h

@@ -69,7 +69,7 @@ private:
     ScopedPointer<JucerDocument> loadedDocument;
     String filename, constructorParams;
     Time lastModificationTime;
-    LookAndFeel lookAndFeel;
+    LookAndFeel_V2 lookAndFeel;
     const bool alwaysFillBackground;
 
     void updateContents();

extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp

@@ -2913,6 +2913,30 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
+    <Unit filename="../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp">
       <Option compile="0"/>
       <Option link="0"/>
@@ -3201,14 +3225,6 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
-    <Unit filename="../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
-    <Unit filename="../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h">
-      <Option compile="0"/>
-      <Option link="0"/>
-    </Unit>
     <Unit filename="../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h">
       <Option compile="0"/>
       <Option link="0"/>

extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj

@@ -157,6 +157,7 @@
 		1B3C2797B04E0FC6699DFDF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1BDF3CAE40B1FDD559BC3DD3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnection.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnection.h"; sourceTree = "SOURCE_ROOT"; };
 		1C36F82D875B81C26A5752AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioPluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		1CC471FC753878B5DCC08E1A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		1CCB7B18759F7CEBB065C31E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AppleRemote.h"; path = "../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h"; sourceTree = "SOURCE_ROOT"; };
 		1D0DD674EEEF98B1E1B8D8D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1D3DA514A7B46A2A32A32060 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -203,6 +204,7 @@
 		2820D74789660269902DB93A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Uuid.cpp"; path = "../../../../modules/juce_core/misc/juce_Uuid.cpp"; sourceTree = "SOURCE_ROOT"; };
 		282C1DA3A161FEF2AD6F94A6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CodeTokeniser.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h"; sourceTree = "SOURCE_ROOT"; };
 		285D320DF8A2D10C5990334A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_mac_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
+		294B94430FBB9DBE99FCF93C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2954678FE7AB78F318FBD4F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileInputStream.h"; path = "../../../../modules/juce_core/files/juce_FileInputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		295A470694011EBCA802822B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLGraphicsContext.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2968B26144E09D6A6659E739 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectShowComponent.h"; path = "../../../../modules/juce_video/playback/juce_DirectShowComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -454,6 +456,7 @@
 		683535B25CE57F64EC61EFD1 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		687E1D120E47EEFEEB73A4BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableText.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.cpp"; sourceTree = "SOURCE_ROOT"; };
 		690BE5039AADEF787D6E13D9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AudioDemoTabComponent.cpp; path = ../../Source/demos/AudioDemoTabComponent.cpp; sourceTree = "SOURCE_ROOT"; };
+		69B37AE6A1496C705CA20B14 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		6A4819E134CD45BD043C3219 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Socket.cpp"; path = "../../../../modules/juce_core/network/juce_Socket.cpp"; sourceTree = "SOURCE_ROOT"; };
 		6A7463E25E5C0C70C01B5054 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextDiff.cpp"; path = "../../../../modules/juce_core/text/juce_TextDiff.cpp"; sourceTree = "SOURCE_ROOT"; };
 		6A9868E67963F63A4819A56B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ConcertinaPanel.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -532,7 +535,6 @@
 		7F580113B80A85759A406E81 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Files.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7F65B8E1571AA346AA2F2FE8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReverbAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7FC1A0B1663AC9262104D715 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyListener.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.h"; sourceTree = "SOURCE_ROOT"; };
-		8042D0D2B38EBD19652CBA55 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		805B94425CD56EA78E0A705B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioDemoPlaybackPage.h; path = ../../Source/demos/AudioDemoPlaybackPage.h; sourceTree = "SOURCE_ROOT"; };
 		80945993EC383052DA7BB92D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderer.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderer.h"; sourceTree = "SOURCE_ROOT"; };
 		80E7D8D4E601BCC20054475E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
@@ -565,7 +567,6 @@
 		890F3D7DA5BC01DACF8E5431 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_events.mm"; path = "../../../../modules/juce_events/juce_events.mm"; sourceTree = "SOURCE_ROOT"; };
 		8939B318C3AF6793C72D8A9E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ArrayAllocationBase.h"; path = "../../../../modules/juce_core/containers/juce_ArrayAllocationBase.h"; sourceTree = "SOURCE_ROOT"; };
 		893D867B3AB93E4D96AF060E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ProgressBar.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ProgressBar.h"; sourceTree = "SOURCE_ROOT"; };
-		896140063D12A19D1DCBF3DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		897420C9C4D80F1AE5F80637 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
 		89ABB9AFCDB73A409754BE48 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
 		89F519023C03C9908F761BAE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBrowserListener.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h"; sourceTree = "SOURCE_ROOT"; };
@@ -779,6 +780,7 @@
 		C5FF20572B734C4EE8F204B6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SHA256.cpp"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C66E08F5118F529FC623733E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallbackMessage.h"; path = "../../../../modules/juce_events/messages/juce_CallbackMessage.h"; sourceTree = "SOURCE_ROOT"; };
 		C6DF852AEB35D096094E7C05 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IPAddress.cpp"; path = "../../../../modules/juce_core/network/juce_IPAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
+		C73EBA3CE1E3B72AF5B106A2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C766591C3E8CB978D6026F56 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterProcessLock.h"; path = "../../../../modules/juce_core/threads/juce_InterProcessLock.h"; sourceTree = "SOURCE_ROOT"; };
 		C7835B9A7DA88BE84F1366E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Expression.h"; path = "../../../../modules/juce_core/maths/juce_Expression.h"; sourceTree = "SOURCE_ROOT"; };
 		C7DAB2D405C907CDA83C2924 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioProcessorEditor.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -836,6 +838,7 @@
 		D5DE603FFC184C590E2A6678 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioCDBurner.h"; path = "../../../../modules/juce_audio_devices/audio_cd/juce_AudioCDBurner.h"; sourceTree = "SOURCE_ROOT"; };
 		D6C9614D1C6493DBEE370646 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileBasedDocument.cpp"; path = "../../../../modules/juce_gui_extra/documents/juce_FileBasedDocument.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D7239D5B984E07808E2DB28C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLHelpers.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLHelpers.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D866C4735BF1EF0CA24FC1FB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../modules/juce_opengl/opengl/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; };
 		D8AFC87A918360FFC9D96BE5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Atomic.h"; path = "../../../../modules/juce_core/memory/juce_Atomic.h"; sourceTree = "SOURCE_ROOT"; };
 		DA0D464BE6E90C3668AD7C73 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_FileChooser.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_FileChooser.mm"; sourceTree = "SOURCE_ROOT"; };
 		DEB23C98FEC261260F63B6A4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
@@ -850,7 +853,6 @@
 		D602AE751C3C12A6458FCCD5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResizableBorderComponent.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ResizableBorderComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		D7E6E92AA32B7D51489FD256 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentBoundsConstrainer.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.h"; sourceTree = "SOURCE_ROOT"; };
 		D8081154AA3072D2F2C4B625 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_posix_SharedCode.h"; path = "../../../../modules/juce_core/native/juce_posix_SharedCode.h"; sourceTree = "SOURCE_ROOT"; };
-		D866C4735BF1EF0CA24FC1FB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Draggable3DOrientation.h"; path = "../../../../modules/juce_opengl/opengl/juce_Draggable3DOrientation.h"; sourceTree = "SOURCE_ROOT"; };
 		D9282DF6556197822D2BD5D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9AB5165697DB60BA305F414 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_OpenSL.cpp"; path = "../../../../modules/juce_audio_devices/native/juce_android_OpenSL.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DA2FCB30EE2A41085FF93B9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_Files.cpp"; path = "../../../../modules/juce_core/native/juce_win32_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -869,6 +871,7 @@
 		DFEAB699C98B89FF0B85F557 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeLayout.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeLayout.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DFF6BF0BB64714A494A25E93 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RSAKey.h"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.h"; sourceTree = "SOURCE_ROOT"; };
 		E15F577E82B2E12597447472 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationBase.h"; path = "../../../../modules/juce_events/messages/juce_ApplicationBase.h"; sourceTree = "SOURCE_ROOT"; };
+		E197A55A32B999BDE0A6050F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E26E3AC933F70B56B7B83EFA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MACAddress.cpp"; path = "../../../../modules/juce_core/network/juce_MACAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E2732267CD7C0C3BDB17456A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BooleanPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_BooleanPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E274BFB25D87D93EDBC23114 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OggVorbisAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h"; sourceTree = "SOURCE_ROOT"; };
@@ -879,6 +882,7 @@
 		E46977801F19277F4D3B324B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLImage.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLImage.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E48615F1F7D8213F6DC24FC9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadPool.h"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.h"; sourceTree = "SOURCE_ROOT"; };
 		E48E2824CED9933934127522 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
+		E58737860E51CD5AD55065B3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		E5DC4602843749A071B17576 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Slider.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.h"; sourceTree = "SOURCE_ROOT"; };
 		E6B13A51A01032961340735D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StringPairArray.cpp"; path = "../../../../modules/juce_core/text/juce_StringPairArray.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E6C582E67DC0C4D0CCA18166 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ShapeButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ShapeButton.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1819,7 +1823,13 @@
 				03AB3157D77979CDD2601A86 ); name = properties; sourceTree = "<group>"; };
 		E4A2262D5F17C9E13403F764 = { isa = PBXGroup; children = (
 				2F7FE4AA919A66D5EFF65A86,
-				329BD0A0243005D36A444135 ); name = lookandfeel; sourceTree = "<group>"; };
+				329BD0A0243005D36A444135,
+				E197A55A32B999BDE0A6050F,
+				E58737860E51CD5AD55065B3,
+				294B94430FBB9DBE99FCF93C,
+				69B37AE6A1496C705CA20B14,
+				C73EBA3CE1E3B72AF5B106A2,
+				1CC471FC753878B5DCC08E1A ); name = lookandfeel; sourceTree = "<group>"; };
 		D529A26C2B113F5DC6DD3571 = { isa = PBXGroup; children = (
 				5725CB557A7D55CA59E18324,
 				EC180AD91D1B068D7A8F33BB,
@@ -1918,10 +1928,7 @@
 				2E7A4C5E41B3BEBC444B5935,
 				1E868017015269856168EBA1,
 				D226630AEE6B273B6B1ED622 ); name = embedding; sourceTree = "<group>"; };
-		AD533544879D32FDC9647970 = { isa = PBXGroup; children = (
-				8042D0D2B38EBD19652CBA55,
-				896140063D12A19D1DCBF3DF ); name = lookandfeel; sourceTree = "<group>"; };
-		E2081DA359B95C05D825E9DB = { isa = PBXGroup; children = (
+		44437C78DBA92D80635C45E4 = { isa = PBXGroup; children = (
 				1CCB7B18759F7CEBB065C31E,
 				0E74D38CAF5F8C914132F4D5,
 				61941C6E24D2D04F51F59134,
@@ -1938,7 +1945,7 @@
 				61E83A490FBB38A8D7613146,
 				476F1E00A832948D22B468C1,
 				9D042E1CAB03CFCD4B937951 ); name = misc; sourceTree = "<group>"; };
-		6478E04ACFBEA2CBBBE97006 = { isa = PBXGroup; children = (
+		FCF227B0C1009561F3892A3B = { isa = PBXGroup; children = (
 				3D5DB29BE2D59A93B5516273,
 				2E02355C7790F4B6EA0CC56E,
 				DF590CD70352A30FA3BD9835,
@@ -1955,9 +1962,8 @@
 				0738039F7E5D430630032154,
 				640482925394FB311FDAB984,
 				1E1530112868032A2C02F4A4,
-				AD533544879D32FDC9647970,
-				E2081DA359B95C05D825E9DB,
-				6478E04ACFBEA2CBBBE97006,
+				44437C78DBA92D80635C45E4,
+				FCF227B0C1009561F3892A3B,
 				5E12C726C5DBB9C81963FAB5,
 				A97EC32975392744C62684F9 ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		EB8917291F41B7345B13B53E = { isa = PBXGroup; children = (

extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj

@@ -3835,6 +3835,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -4214,19 +4247,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj

@@ -3835,6 +3835,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -4214,19 +4247,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj

@@ -1046,6 +1046,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1139,9 +1148,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1610,6 +1616,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_SliderPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_TextPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsList.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_FileBrowserComponent.h"/>
@@ -1643,7 +1652,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_ColourSelector.h"/>

extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters

@@ -275,9 +275,6 @@
     <Filter Include="Juce Modules\juce_gui_extra\embedding">
       <UniqueIdentifier>{61B2920C-494D-D8CB-C0C7-5DBF3D76D164}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_gui_extra\lookandfeel">
-      <UniqueIdentifier>{4980B18D-FEDE-B773-F254-E3B5207D81F0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_gui_extra\misc">
       <UniqueIdentifier>{66C9B809-8739-A217-C78D-A15D6089B8E3}</UniqueIdentifier>
     </Filter>
@@ -1309,6 +1306,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClCompile>
@@ -1423,9 +1429,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <Filter>Juce Modules\juce_gui_extra\documents</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClCompile>
@@ -2688,6 +2691,15 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClInclude>
@@ -2787,9 +2799,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h">
       <Filter>Juce Modules\juce_gui_extra\embedding</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClInclude>

extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj

@@ -1052,6 +1052,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1145,9 +1154,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1616,6 +1622,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_SliderPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_TextPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsList.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_FileBrowserComponent.h"/>
@@ -1649,7 +1658,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_ColourSelector.h"/>

extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj.filters

@@ -275,9 +275,6 @@
     <Filter Include="Juce Modules\juce_gui_extra\embedding">
       <UniqueIdentifier>{61B2920C-494D-D8CB-C0C7-5DBF3D76D164}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_gui_extra\lookandfeel">
-      <UniqueIdentifier>{4980B18D-FEDE-B773-F254-E3B5207D81F0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_gui_extra\misc">
       <UniqueIdentifier>{66C9B809-8739-A217-C78D-A15D6089B8E3}</UniqueIdentifier>
     </Filter>
@@ -1309,6 +1306,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClCompile>
@@ -1423,9 +1429,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <Filter>Juce Modules\juce_gui_extra\documents</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClCompile>
@@ -2688,6 +2691,15 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClInclude>
@@ -2787,9 +2799,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h">
       <Filter>Juce Modules\juce_gui_extra\embedding</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClInclude>

extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj

@@ -149,6 +149,7 @@
 		1B3C2797B04E0FC6699DFDF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1BDF3CAE40B1FDD559BC3DD3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnection.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnection.h"; sourceTree = "SOURCE_ROOT"; };
 		1C36F82D875B81C26A5752AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioPluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		1CC471FC753878B5DCC08E1A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		1CCB7B18759F7CEBB065C31E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AppleRemote.h"; path = "../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h"; sourceTree = "SOURCE_ROOT"; };
 		1D0DD674EEEF98B1E1B8D8D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1D3DA514A7B46A2A32A32060 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -196,6 +197,7 @@
 		2820D74789660269902DB93A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Uuid.cpp"; path = "../../../../modules/juce_core/misc/juce_Uuid.cpp"; sourceTree = "SOURCE_ROOT"; };
 		282C1DA3A161FEF2AD6F94A6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CodeTokeniser.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeTokeniser.h"; sourceTree = "SOURCE_ROOT"; };
 		285D320DF8A2D10C5990334A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_mac_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_mac_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
+		294B94430FBB9DBE99FCF93C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2954678FE7AB78F318FBD4F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileInputStream.h"; path = "../../../../modules/juce_core/files/juce_FileInputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		295A470694011EBCA802822B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLGraphicsContext.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2968B26144E09D6A6659E739 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectShowComponent.h"; path = "../../../../modules/juce_video/playback/juce_DirectShowComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -445,6 +447,7 @@
 		67F14D1D1869540E4B9540B5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ToolbarButton.h"; sourceTree = "SOURCE_ROOT"; };
 		687E1D120E47EEFEEB73A4BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableText.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableText.cpp"; sourceTree = "SOURCE_ROOT"; };
 		690BE5039AADEF787D6E13D9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AudioDemoTabComponent.cpp; path = ../../Source/demos/AudioDemoTabComponent.cpp; sourceTree = "SOURCE_ROOT"; };
+		69B37AE6A1496C705CA20B14 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		6A4819E134CD45BD043C3219 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Socket.cpp"; path = "../../../../modules/juce_core/network/juce_Socket.cpp"; sourceTree = "SOURCE_ROOT"; };
 		6A7463E25E5C0C70C01B5054 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextDiff.cpp"; path = "../../../../modules/juce_core/text/juce_TextDiff.cpp"; sourceTree = "SOURCE_ROOT"; };
 		6A9868E67963F63A4819A56B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ConcertinaPanel.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ConcertinaPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -525,7 +528,6 @@
 		7F580113B80A85759A406E81 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Files.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7F65B8E1571AA346AA2F2FE8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReverbAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7FC1A0B1663AC9262104D715 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_KeyListener.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.h"; sourceTree = "SOURCE_ROOT"; };
-		8042D0D2B38EBD19652CBA55 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		805B94425CD56EA78E0A705B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioDemoPlaybackPage.h; path = ../../Source/demos/AudioDemoPlaybackPage.h; sourceTree = "SOURCE_ROOT"; };
 		80945993EC383052DA7BB92D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLRenderer.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLRenderer.h"; sourceTree = "SOURCE_ROOT"; };
 		80E7D8D4E601BCC20054475E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ActionBroadcaster.h"; path = "../../../../modules/juce_events/broadcasters/juce_ActionBroadcaster.h"; sourceTree = "SOURCE_ROOT"; };
@@ -558,7 +560,6 @@
 		890F3D7DA5BC01DACF8E5431 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_events.mm"; path = "../../../../modules/juce_events/juce_events.mm"; sourceTree = "SOURCE_ROOT"; };
 		8939B318C3AF6793C72D8A9E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ArrayAllocationBase.h"; path = "../../../../modules/juce_core/containers/juce_ArrayAllocationBase.h"; sourceTree = "SOURCE_ROOT"; };
 		893D867B3AB93E4D96AF060E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ProgressBar.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ProgressBar.h"; sourceTree = "SOURCE_ROOT"; };
-		896140063D12A19D1DCBF3DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		897420C9C4D80F1AE5F80637 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
 		89ABB9AFCDB73A409754BE48 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
 		89F519023C03C9908F761BAE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBrowserListener.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h"; sourceTree = "SOURCE_ROOT"; };
@@ -770,6 +771,7 @@
 		C5FF20572B734C4EE8F204B6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SHA256.cpp"; path = "../../../../modules/juce_cryptography/hashing/juce_SHA256.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C66E08F5118F529FC623733E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallbackMessage.h"; path = "../../../../modules/juce_events/messages/juce_CallbackMessage.h"; sourceTree = "SOURCE_ROOT"; };
 		C6DF852AEB35D096094E7C05 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IPAddress.cpp"; path = "../../../../modules/juce_core/network/juce_IPAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
+		C73EBA3CE1E3B72AF5B106A2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C766591C3E8CB978D6026F56 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterProcessLock.h"; path = "../../../../modules/juce_core/threads/juce_InterProcessLock.h"; sourceTree = "SOURCE_ROOT"; };
 		C7835B9A7DA88BE84F1366E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Expression.h"; path = "../../../../modules/juce_core/maths/juce_Expression.h"; sourceTree = "SOURCE_ROOT"; };
 		C7DAB2D405C907CDA83C2924 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioProcessorEditor.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -850,6 +852,7 @@
 		DF590CD70352A30FA3BD9835 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_SystemTrayIcon.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_SystemTrayIcon.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DFF6BF0BB64714A494A25E93 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RSAKey.h"; path = "../../../../modules/juce_cryptography/encryption/juce_RSAKey.h"; sourceTree = "SOURCE_ROOT"; };
 		E0AE248F52C70AA1DEA1A5A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiOutput.h"; path = "../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h"; sourceTree = "SOURCE_ROOT"; };
+		E197A55A32B999BDE0A6050F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E249D6583995E0E6D0B3EADF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSourcePlayer.h"; path = "../../../../modules/juce_audio_devices/sources/juce_AudioSourcePlayer.h"; sourceTree = "SOURCE_ROOT"; };
 		E26E3AC933F70B56B7B83EFA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MACAddress.cpp"; path = "../../../../modules/juce_core/network/juce_MACAddress.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E274BFB25D87D93EDBC23114 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OggVorbisAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h"; sourceTree = "SOURCE_ROOT"; };
@@ -871,6 +874,7 @@
 		E453E312D607E60FAA6D1BF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MultiDocumentPanel.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_MultiDocumentPanel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E46977801F19277F4D3B324B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OpenGLImage.cpp"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLImage.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E48E2824CED9933934127522 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
+		E58737860E51CD5AD55065B3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		E5DC4602843749A071B17576 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Slider.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.h"; sourceTree = "SOURCE_ROOT"; };
 		E6B13A51A01032961340735D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StringPairArray.cpp"; path = "../../../../modules/juce_core/text/juce_StringPairArray.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E6C582E67DC0C4D0CCA18166 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ShapeButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ShapeButton.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1809,7 +1813,13 @@
 				03AB3157D77979CDD2601A86 ); name = properties; sourceTree = "<group>"; };
 		E4A2262D5F17C9E13403F764 = { isa = PBXGroup; children = (
 				2F7FE4AA919A66D5EFF65A86,
-				329BD0A0243005D36A444135 ); name = lookandfeel; sourceTree = "<group>"; };
+				329BD0A0243005D36A444135,
+				E197A55A32B999BDE0A6050F,
+				E58737860E51CD5AD55065B3,
+				294B94430FBB9DBE99FCF93C,
+				69B37AE6A1496C705CA20B14,
+				C73EBA3CE1E3B72AF5B106A2,
+				1CC471FC753878B5DCC08E1A ); name = lookandfeel; sourceTree = "<group>"; };
 		D529A26C2B113F5DC6DD3571 = { isa = PBXGroup; children = (
 				5725CB557A7D55CA59E18324,
 				EC180AD91D1B068D7A8F33BB,
@@ -1908,10 +1918,7 @@
 				2E7A4C5E41B3BEBC444B5935,
 				1E868017015269856168EBA1,
 				D226630AEE6B273B6B1ED622 ); name = embedding; sourceTree = "<group>"; };
-		AD533544879D32FDC9647970 = { isa = PBXGroup; children = (
-				8042D0D2B38EBD19652CBA55,
-				896140063D12A19D1DCBF3DF ); name = lookandfeel; sourceTree = "<group>"; };
-		E2081DA359B95C05D825E9DB = { isa = PBXGroup; children = (
+		44437C78DBA92D80635C45E4 = { isa = PBXGroup; children = (
 				1CCB7B18759F7CEBB065C31E,
 				0E74D38CAF5F8C914132F4D5,
 				61941C6E24D2D04F51F59134,
@@ -1928,7 +1935,7 @@
 				61E83A490FBB38A8D7613146,
 				476F1E00A832948D22B468C1,
 				9D042E1CAB03CFCD4B937951 ); name = misc; sourceTree = "<group>"; };
-		6478E04ACFBEA2CBBBE97006 = { isa = PBXGroup; children = (
+		FCF227B0C1009561F3892A3B = { isa = PBXGroup; children = (
 				3D5DB29BE2D59A93B5516273,
 				2E02355C7790F4B6EA0CC56E,
 				DF590CD70352A30FA3BD9835,
@@ -1945,9 +1952,8 @@
 				0738039F7E5D430630032154,
 				640482925394FB311FDAB984,
 				1E1530112868032A2C02F4A4,
-				AD533544879D32FDC9647970,
-				E2081DA359B95C05D825E9DB,
-				6478E04ACFBEA2CBBBE97006,
+				44437C78DBA92D80635C45E4,
+				FCF227B0C1009561F3892A3B,
 				5E12C726C5DBB9C81963FAB5,
 				A97EC32975392744C62684F9 ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		EB8917291F41B7345B13B53E = { isa = PBXGroup; children = (

extras/JuceDemo/Source/MainDemoWindow.cpp

@@ -104,8 +104,9 @@ public:
         }
         else if (menuIndex == 1)
         {
-            menu.addCommandItem (commandManager, setDefaultLookAndFeel);
-            menu.addCommandItem (commandManager, setOldSchoolLookAndFeel);
+            menu.addCommandItem (commandManager, useLookAndFeelV1);
+            menu.addCommandItem (commandManager, useLookAndFeelV2);
+            menu.addCommandItem (commandManager, useLookAndFeelV3);
             menu.addSeparator();
             menu.addCommandItem (commandManager, useNativeTitleBar);
 
@@ -200,8 +201,9 @@ public:
                                   showWebBrowser,
                                   showCodeEditor,
                                   showInterprocessComms,
-                                  setDefaultLookAndFeel,
-                                  setOldSchoolLookAndFeel,
+                                  useLookAndFeelV1,
+                                  useLookAndFeelV2,
+                                  useLookAndFeelV3,
                                   useNativeTitleBar
                                  #if JUCE_MAC
                                   , useNativeMenus
@@ -329,14 +331,19 @@ public:
             result.setTicked (currentDemoId == showInterprocessComms);
             break;
 
-        case setDefaultLookAndFeel:
-            result.setInfo ("Use default look-and-feel", String::empty, generalCategory, 0);
-            result.setTicked (dynamic_cast <OldSchoolLookAndFeel*> (&getLookAndFeel()) == 0);
+        case useLookAndFeelV1:
+            result.setInfo ("Use LookAndFeel_V1", String::empty, generalCategory, 0);
+            result.setTicked (typeid (LookAndFeel_V1) == typeid (getLookAndFeel()));
             break;
 
-        case setOldSchoolLookAndFeel:
-            result.setInfo ("Use the old, original juce look-and-feel", String::empty, generalCategory, 0);
-            result.setTicked (dynamic_cast <OldSchoolLookAndFeel*> (&getLookAndFeel()) != 0);
+        case useLookAndFeelV2:
+            result.setInfo ("Use LookAndFeel_V2", String::empty, generalCategory, 0);
+            result.setTicked (typeid (LookAndFeel_V2) == typeid (getLookAndFeel()));
+            break;
+
+        case useLookAndFeelV3:
+            result.setInfo ("Use LookAndFeel_V3", String::empty, generalCategory, 0);
+            result.setTicked (typeid (LookAndFeel_V3) == typeid (getLookAndFeel()));
             break;
 
         case useNativeTitleBar:
@@ -458,13 +465,9 @@ public:
             currentDemoId = showInterprocessComms;
             break;
 
-        case setDefaultLookAndFeel:
-            LookAndFeel::setDefaultLookAndFeel (nullptr);
-            break;
-
-        case setOldSchoolLookAndFeel:
-            LookAndFeel::setDefaultLookAndFeel (&oldLookAndFeel);
-            break;
+        case useLookAndFeelV1:  LookAndFeel::setDefaultLookAndFeel (&lookAndFeelV1); break;
+        case useLookAndFeelV2:  LookAndFeel::setDefaultLookAndFeel (&lookAndFeelV2); break;
+        case useLookAndFeelV3:  LookAndFeel::setDefaultLookAndFeel (&lookAndFeelV3); break;
 
         case useNativeTitleBar:
             mainWindow.setUsingNativeTitleBar (! mainWindow.isUsingNativeTitleBar());
@@ -510,7 +513,9 @@ public:
 private:
     //==============================================================================
     MainDemoWindow& mainWindow;
-    OldSchoolLookAndFeel oldLookAndFeel;
+    LookAndFeel_V1 lookAndFeelV1;
+    LookAndFeel_V2 lookAndFeelV2;
+    LookAndFeel_V3 lookAndFeelV3;
     ScopedPointer<Component> currentDemo;
     int currentDemoId;
 
@@ -553,11 +558,12 @@ private:
         showCodeEditor             = 0x2013,
         showDirectShow             = 0x2014,
 
-        setDefaultLookAndFeel      = 0x200b,
-        setOldSchoolLookAndFeel    = 0x200c,
-        useNativeTitleBar          = 0x200d,
-        useNativeMenus             = 0x200e,
-        goToKioskMode              = 0x200f
+        useLookAndFeelV1           = 0x2020,
+        useLookAndFeelV2           = 0x2021,
+        useLookAndFeelV3           = 0x2022,
+        useNativeTitleBar          = 0x2023,
+        useNativeMenus             = 0x2024,
+        goToKioskMode              = 0x2025
     };
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ContentComp)

extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj

@@ -138,6 +138,7 @@
 		103FA4C6C505052C818A4829 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUTimestampGenerator.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUTimestampGenerator.h; sourceTree = "DEVELOPER_DIR"; };
 		104CC5F094E0B3D1D3055D04 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioUnitPluginFormat.h"; path = "../../../../modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h"; sourceTree = "SOURCE_ROOT"; };
 		10A49DD74F3FB9E69FC989B9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
+		10C46E275C321A3974729DA6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1127215528CC4A4A504078BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RenderingHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_RenderingHelpers.h"; sourceTree = "SOURCE_ROOT"; };
 		115FCA1C09C15AD7EB4AC87C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BufferedInputStream.cpp"; path = "../../../../modules/juce_core/streams/juce_BufferedInputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
 		121FB46FF3426D00B9776611 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChoicePropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
@@ -152,6 +153,7 @@
 		14A221649E68BA8FD0EADAE7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SplashScreen.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SplashScreen.h"; sourceTree = "SOURCE_ROOT"; };
 		1519F1DAEF1445EEBC1D75DD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_PropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1588973F0A055D4CF5D44823 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Sampler.h"; path = "../../../../modules/juce_audio_formats/sampler/juce_Sampler.h"; sourceTree = "SOURCE_ROOT"; };
+		158EE06B4B48E5480FAAB795 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		15A4CCD9171AC94932E836D2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"; sourceTree = "SOURCE_ROOT"; };
 		15C711BB78FE9CF9CD9569E8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileDragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_FileDragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; };
 		16628E0BBD62134897747ED4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableImage.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableImage.h"; sourceTree = "SOURCE_ROOT"; };
@@ -168,7 +170,6 @@
 		19D63B88BE3B2620D7EB8489 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_processors.h"; path = "../../../../modules/juce_audio_processors/juce_audio_processors.h"; sourceTree = "SOURCE_ROOT"; };
 		19F3E1F0B144D48016FDF6C0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_NamedValueSet.cpp"; path = "../../../../modules/juce_core/containers/juce_NamedValueSet.cpp"; sourceTree = "SOURCE_ROOT"; };
 		19FE75EF12C18CF52D11D37E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponent.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm"; sourceTree = "SOURCE_ROOT"; };
-		1A487CF48178F86FFF3E0EE9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1A842FCA201F57BF276F5F19 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CoreAudioFormat.h"; path = "../../../../modules/juce_audio_formats/codecs/juce_CoreAudioFormat.h"; sourceTree = "SOURCE_ROOT"; };
 		1AA472D8429FFDFBE7CD01BD = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_audio_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		1B2CE3B669D290A88A797C1A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_NativeMessageBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_NativeMessageBox.h"; sourceTree = "SOURCE_ROOT"; };
@@ -189,7 +190,6 @@
 		1E496F7BF3B3C59E5ECACCDE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VST_Wrapper.cpp"; path = "../../../../modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1E4CD6428BE6C12C54575EC2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_StretchableObjectResizer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_StretchableObjectResizer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1EC0F9F4EC617BA4C2217C2C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AsyncUpdater.cpp"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.cpp"; sourceTree = "SOURCE_ROOT"; };
-		1EFE70BA92D9C9771384F6EB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		1F60FF59922FECB5CD789D48 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PNGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_PNGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1FBFF2D9043296E1E09DE156 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BigInteger.cpp"; path = "../../../../modules/juce_core/maths/juce_BigInteger.cpp"; sourceTree = "SOURCE_ROOT"; };
 		201F62BBDF90DC3F1C9684C3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileOutputStream.cpp"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -225,6 +225,7 @@
 		2AA92DC1171DAF0BA4BB0E63 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_formats.h"; path = "../../../../modules/juce_audio_formats/juce_audio_formats.h"; sourceTree = "SOURCE_ROOT"; };
 		2B2D54521D69CF4407471A56 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUBase.cpp; path = Extras/CoreAudio/AudioUnits/AUPublic/AUBase/AUBase.cpp; sourceTree = "DEVELOPER_DIR"; };
 		2BEBB7EB22A689648A381ECA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TabbedComponent.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_TabbedComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		2CAFB89BC62E47429CC04AEA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2D4B766DA1C66FA2857D80F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RTAS_DigiCode3.cpp"; path = "../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2D799F4BCA83847DEACB505D = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		2E19A0C6793FD28085F7A256 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUMIDIBase.cpp; path = Extras/CoreAudio/AudioUnits/AUPublic/OtherBases/AUMIDIBase.cpp; sourceTree = "DEVELOPER_DIR"; };
@@ -347,12 +348,14 @@
 		4F54F099B1373706B52E5774 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PluginDescription.cpp"; path = "../../../../modules/juce_audio_processors/processors/juce_PluginDescription.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4F790401362D3F12680B726E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Slider.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4FB58D47EA973CA9529AF6A9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TemporaryFile.cpp"; path = "../../../../modules/juce_core/files/juce_TemporaryFile.cpp"; sourceTree = "SOURCE_ROOT"; };
+		4FCB6E7A042E17CEC055BE75 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		4FD86B7C71BEC7627C40B694 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChannelRemappingAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
 		4FF264791CA989D4CFD083F3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyPressMappingSet.cpp"; path = "../../../../modules/juce_gui_basics/commands/juce_KeyPressMappingSet.cpp"; sourceTree = "SOURCE_ROOT"; };
 		50832A0FAB3B736F1AD5E693 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPosition.h"; path = "../../../../modules/juce_gui_basics/layout/juce_AnimatedPosition.h"; sourceTree = "SOURCE_ROOT"; };
 		508D1DF2D93C6F05EE75EDE8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DrawableRectangle.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableRectangle.h"; sourceTree = "SOURCE_ROOT"; };
 		50F1E35F917489F92521D617 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResizableCornerComponent.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ResizableCornerComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		513637A8BE7D94200DCBD1F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LowLevelGraphicsContext.h"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsContext.h"; sourceTree = "SOURCE_ROOT"; };
+		513BA2176B24BC61831B58FD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		519C6BF83160A6B581905C58 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUOutputElement.h; path = Extras/CoreAudio/AudioUnits/AUPublic/AUBase/AUOutputElement.h; sourceTree = "DEVELOPER_DIR"; };
 		522D22FEB38D52304F01508D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TooltipClient.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_TooltipClient.h"; sourceTree = "SOURCE_ROOT"; };
 		525EF648F69C3D42DA9B06E3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AudioCDBurner.mm"; path = "../../../../modules/juce_audio_devices/native/juce_mac_AudioCDBurner.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -943,6 +946,7 @@
 		FE0B9D0C5E9B31DF6B7E3616 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeRectangle.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeRectangle.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FE3BB21C1A01E682BE4157F8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WildcardFileFilter.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_WildcardFileFilter.h"; sourceTree = "SOURCE_ROOT"; };
 		FE7BF03E997B68345D812C18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentDragger.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_ComponentDragger.h"; sourceTree = "SOURCE_ROOT"; };
+		FEDF58985DBA59E34FC99B20 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FF25FC2D49382DCBDB76BC48 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemTrayIconComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		FF443F140558EBF4EE8819F9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CodeEditorComponent.cpp"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		FFB44C10D77D4B9DCA431C69 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileSearchPath.h"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1782,7 +1786,13 @@
 				470E16E41C4A2F1ADADAFE52 ); name = properties; sourceTree = "<group>"; };
 		01B04245386FBFD1BAA2EB47 = { isa = PBXGroup; children = (
 				E0EE8480E1438F1521ABC0DB,
-				DFF33C1951C79E101D905003 ); name = lookandfeel; sourceTree = "<group>"; };
+				DFF33C1951C79E101D905003,
+				2CAFB89BC62E47429CC04AEA,
+				4FCB6E7A042E17CEC055BE75,
+				10C46E275C321A3974729DA6,
+				513BA2176B24BC61831B58FD,
+				FEDF58985DBA59E34FC99B20,
+				158EE06B4B48E5480FAAB795 ); name = lookandfeel; sourceTree = "<group>"; };
 		16B033C5A8508A526D64FD94 = { isa = PBXGroup; children = (
 				538BF18F9D29A2A60EF6A6CE,
 				29917AAA580F21BF2798D071,
@@ -1881,10 +1891,7 @@
 				A11F51909BE2463C28099C0B,
 				BCB54D2E4C0C3357DACFD29B,
 				FABC846A7451773CA5FEDA13 ); name = embedding; sourceTree = "<group>"; };
-		35BF6F4F89C85C16173ACB32 = { isa = PBXGroup; children = (
-				1A487CF48178F86FFF3E0EE9,
-				1EFE70BA92D9C9771384F6EB ); name = lookandfeel; sourceTree = "<group>"; };
-		15F185E0F6AB1F1B887AEB5D = { isa = PBXGroup; children = (
+		A4D5C22EAEECE5134B247F54 = { isa = PBXGroup; children = (
 				7CAABF65B56BE6A4529B2513,
 				A31CE7177BF947DB60F72D94,
 				598E9C9D95393B4E4699CF0B,
@@ -1901,7 +1908,7 @@
 				81766EF7DB6CE1CB01017097,
 				FF25FC2D49382DCBDB76BC48,
 				C4BC9568B31F3E7EC4C3C7E6 ); name = misc; sourceTree = "<group>"; };
-		236EF0A98CB51A9FDF1CE5E8 = { isa = PBXGroup; children = (
+		B544D64863CF5CC0B4E0980E = { isa = PBXGroup; children = (
 				F80CC5FB6425D6B5DD1BBC59,
 				219FBFE9990AA2ACA2F15FC1,
 				C2C92FCE31284C0292F55427,
@@ -1918,9 +1925,8 @@
 				B2B055337E596E2DAA7D427C,
 				F430D956469E7E4528571CD8,
 				303B6B606A73D0F37EB9C4F0,
-				35BF6F4F89C85C16173ACB32,
-				15F185E0F6AB1F1B887AEB5D,
-				236EF0A98CB51A9FDF1CE5E8,
+				A4D5C22EAEECE5134B247F54,
+				B544D64863CF5CC0B4E0980E,
 				91B2EAD28E322C2F365FF975,
 				7997E4EB2706B00B44880412 ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		C6C3D10F6A56842C3125D633 = { isa = PBXGroup; children = (

extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj

@@ -3715,6 +3715,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -4094,19 +4127,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj

@@ -3715,6 +3715,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -4094,19 +4127,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj

@@ -83,6 +83,7 @@
 		0AFC098702827D38DA03BB73 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TextInputTarget.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_TextInputTarget.h"; sourceTree = "SOURCE_ROOT"; };
 		0B05D046FF5FA8809CF40CFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentBoundsConstrainer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0B26889F06B1E816BC12D40D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
+		0B36A9CD1921659BA8DA8577 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		0B7FC2052DC952A2080D9535 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_DrawableButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0BD19EFE55728A56EB3EE5C5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Value.h"; path = "../../../../modules/juce_data_structures/values/juce_Value.h"; sourceTree = "SOURCE_ROOT"; };
 		0C339E5B52835F87ABD2BF95 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Thread.cpp"; path = "../../../../modules/juce_core/threads/juce_Thread.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -143,7 +144,6 @@
 		1B6A039FE3A63210FC1936D2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_formats.h"; path = "../../../../modules/juce_audio_formats/juce_audio_formats.h"; sourceTree = "SOURCE_ROOT"; };
 		1C1943E3582BA78117F881B3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_QuickTimeMovieComponent.mm"; path = "../../../../modules/juce_video/native/juce_mac_QuickTimeMovieComponent.mm"; sourceTree = "SOURCE_ROOT"; };
 		1C4E46D37FD0A75012D27F18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableRectangle.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableRectangle.cpp"; sourceTree = "SOURCE_ROOT"; };
-		1C730D0CE68930D4154AA73F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		1C9A92B8262F5780FB04EEE9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectoryContentsList.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsList.h"; sourceTree = "SOURCE_ROOT"; };
 		1CBCE7A7D4723D88F4A7CEB2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnection.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnection.h"; sourceTree = "SOURCE_ROOT"; };
 		1D031D6259B6620760ACD1A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Application.h"; path = "../../../../modules/juce_gui_basics/application/juce_Application.h"; sourceTree = "SOURCE_ROOT"; };
@@ -160,6 +160,7 @@
 		1FDCB594D94782C879005BF7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_mac_CarbonViewWrapperComponent.h"; path = "../../../../modules/juce_gui_extra/native/juce_mac_CarbonViewWrapperComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		207C876A93611B390835E9AE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AbstractFifo.cpp"; path = "../../../../modules/juce_core/containers/juce_AbstractFifo.cpp"; sourceTree = "SOURCE_ROOT"; };
 		211E522AB68EFF013607E737 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDeviceSelectorComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		2133298538ECFED56C3EBC9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		215B120156B822291476B0A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileInputStream.h"; path = "../../../../modules/juce_core/files/juce_FileInputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		21706F4B9B65E7715A598F27 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemStats.cpp"; path = "../../../../modules/juce_core/system/juce_SystemStats.cpp"; sourceTree = "SOURCE_ROOT"; };
 		2176F72FC750E8376E696CAF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OptionalScopedPointer.h"; path = "../../../../modules/juce_core/memory/juce_OptionalScopedPointer.h"; sourceTree = "SOURCE_ROOT"; };
@@ -507,6 +508,7 @@
 		8A2CC00AD83204B6A448BD0C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FilenameComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		8A4FF1BDC954581622F65942 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CallOutBox.h"; path = "../../../../modules/juce_gui_basics/windows/juce_CallOutBox.h"; sourceTree = "SOURCE_ROOT"; };
 		8ABD0FB2EC361F77759F54D5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PropertySet.cpp"; path = "../../../../modules/juce_core/containers/juce_PropertySet.cpp"; sourceTree = "SOURCE_ROOT"; };
+		8B3064F8C6E1E56B249CA6C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		8B9FDF0245BB8A4AA9996C3C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Synthesiser.h"; path = "../../../../modules/juce_audio_basics/synthesisers/juce_Synthesiser.h"; sourceTree = "SOURCE_ROOT"; };
 		8BA1AF085755958342C9213A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OpenGLPixelFormat.h"; path = "../../../../modules/juce_opengl/opengl/juce_OpenGLPixelFormat.h"; sourceTree = "SOURCE_ROOT"; };
 		8BD050801C810B95634B6326 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OwnedArray.h"; path = "../../../../modules/juce_core/containers/juce_OwnedArray.h"; sourceTree = "SOURCE_ROOT"; };
@@ -761,7 +763,6 @@
 		D41EA1E6002DE5DEB9A07CAA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ComponentPeer.h"; path = "../../../../modules/juce_gui_basics/windows/juce_ComponentPeer.h"; sourceTree = "SOURCE_ROOT"; };
 		D4DA13E7A12FB69C072D0FA7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ShapeButton.cpp"; path = "../../../../modules/juce_gui_basics/buttons/juce_ShapeButton.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D4EBC17BDB7F88CCBC76730B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		D579AF76963B677C425CBF00 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		D5952905FC386C19D0818398 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D5C074653417ED69A2B570AC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_processors.mm"; path = "../../../../modules/juce_audio_processors/juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; };
 		D7433453EBB3700D2805FF42 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlDocument.h"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.h"; sourceTree = "SOURCE_ROOT"; };
@@ -772,6 +773,7 @@
 		D8A3F086596562E081EB0F39 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatManager.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatManager.h"; sourceTree = "SOURCE_ROOT"; };
 		D8B7DCDFD32613B13AC54008 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D8C28108DE7AD0208D790606 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ProgressBar.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ProgressBar.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D8E9881F48E0A32121A9E84B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D92D579F2458F2426E5F828A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScopedWriteLock.h"; path = "../../../../modules/juce_core/threads/juce_ScopedWriteLock.h"; sourceTree = "SOURCE_ROOT"; };
 		D950776EDF9260DB0278C132 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SliderPropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_SliderPropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D9857957A36A3081186D53FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_CameraDevice.cpp"; path = "../../../../modules/juce_video/native/juce_android_CameraDevice.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -853,6 +855,7 @@
 		EADDAF5C98DBB22E5EC52A3E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Path.h"; path = "../../../../modules/juce_graphics/geometry/juce_Path.h"; sourceTree = "SOURCE_ROOT"; };
 		EB0AAC967E485ED8F3397E4F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ColourSelector.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_ColourSelector.cpp"; sourceTree = "SOURCE_ROOT"; };
 		EB483815A529FAF11907FC6F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RecentlyOpenedFilesList.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp"; sourceTree = "SOURCE_ROOT"; };
+		EB7A04549EB9E1B5BF31647D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		EC8A477FEDA0FEDA62A7E0C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LowLevelGraphicsSoftwareRenderer.cpp"; path = "../../../../modules/juce_graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		ECF521248AFFE80858112E0B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ScrollBar.h"; path = "../../../../modules/juce_gui_basics/layout/juce_ScrollBar.h"; sourceTree = "SOURCE_ROOT"; };
 		ED1CF17303ACA9101DBF7D18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PositionableAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_PositionableAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
@@ -879,6 +882,7 @@
 		F50F348D6727D72B32538B18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		F52176A07E24A5CC91D03A9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_GraphicsContext.cpp"; path = "../../../../modules/juce_graphics/native/juce_android_GraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F52AF269A66132FFEC566C7B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DirectShowComponent.h"; path = "../../../../modules/juce_video/playback/juce_DirectShowComponent.h"; sourceTree = "SOURCE_ROOT"; };
+		F62FDD92B106245BB2C740F9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F641B60F8AE931E3B660A842 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SortedSet.h"; path = "../../../../modules/juce_core/containers/juce_SortedSet.h"; sourceTree = "SOURCE_ROOT"; };
 		F66DF7F30ADE40EEEE6E15B7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		F69282947987DE2626D23C52 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_cryptography.mm"; path = "../../../../modules/juce_cryptography/juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -1740,7 +1744,13 @@
 				9647232A743A0C7BFE819385 ); name = properties; sourceTree = "<group>"; };
 		5C692DFEB89A20508FD122F4 = { isa = PBXGroup; children = (
 				D8B7DCDFD32613B13AC54008,
-				3CACA414AFB108D5D97D2905 ); name = lookandfeel; sourceTree = "<group>"; };
+				3CACA414AFB108D5D97D2905,
+				2133298538ECFED56C3EBC9B,
+				EB7A04549EB9E1B5BF31647D,
+				D8E9881F48E0A32121A9E84B,
+				8B3064F8C6E1E56B249CA6C9,
+				F62FDD92B106245BB2C740F9,
+				0B36A9CD1921659BA8DA8577 ); name = lookandfeel; sourceTree = "<group>"; };
 		160B7FAD218C3AA1166C3343 = { isa = PBXGroup; children = (
 				51E8F7D6F96EA20F374FD4E9,
 				518475EC1518D59F4BBB64C6,
@@ -1839,10 +1849,7 @@
 				AE77174CBCCD8ED980D37836,
 				382380170B8E1B0FF39435F4,
 				5085F1038F87BFFE07A491C4 ); name = embedding; sourceTree = "<group>"; };
-		ABFFEBE376F32596B10BE82F = { isa = PBXGroup; children = (
-				1C730D0CE68930D4154AA73F,
-				D579AF76963B677C425CBF00 ); name = lookandfeel; sourceTree = "<group>"; };
-		E08ABD60E36AA9DE7B659993 = { isa = PBXGroup; children = (
+		4700EB1C9B14BBA22B871A1E = { isa = PBXGroup; children = (
 				A30AE6BCB8C3947B097DA340,
 				B87839FF32E9244397D28862,
 				043393B6262698FFD549A24A,
@@ -1859,7 +1866,7 @@
 				3E6CE883D9CE0661C39F5BAB,
 				813F42FA0CDB76C5150A482E,
 				AD84F6A526784CB531FB2455 ); name = misc; sourceTree = "<group>"; };
-		7BC1B7739872AA97A43D31FE = { isa = PBXGroup; children = (
+		D06FFD6E422879ABC06B5933 = { isa = PBXGroup; children = (
 				CF299925A6A365E288DC206E,
 				940A181A1BAC2FA88FB5A3B3,
 				DF614EDBEA2D76889E002465,
@@ -1876,9 +1883,8 @@
 				822BE1CCF036C0154376D9CC,
 				1585F98304BC113EA3FBA591,
 				E3D8BED92AD41057CAEB051F,
-				ABFFEBE376F32596B10BE82F,
-				E08ABD60E36AA9DE7B659993,
-				7BC1B7739872AA97A43D31FE,
+				4700EB1C9B14BBA22B871A1E,
+				D06FFD6E422879ABC06B5933,
 				016748F561B0B5046F24DDA0,
 				923E4322525FD5CCAA5F911B ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		E23F6FDE88C4164420DC07F6 = { isa = PBXGroup; children = (

extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj

@@ -1029,6 +1029,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1122,9 +1131,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -1587,6 +1593,9 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_SliderPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\properties\juce_TextPropertyComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsList.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_FileBrowserComponent.h"/>
@@ -1620,7 +1629,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_ActiveXControlComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_ColourSelector.h"/>

extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj.filters

@@ -269,9 +269,6 @@
     <Filter Include="Juce Modules\juce_gui_extra\embedding">
       <UniqueIdentifier>{61B2920C-494D-D8CB-C0C7-5DBF3D76D164}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_gui_extra\lookandfeel">
-      <UniqueIdentifier>{4980B18D-FEDE-B773-F254-E3B5207D81F0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_gui_extra\misc">
       <UniqueIdentifier>{66C9B809-8739-A217-C78D-A15D6089B8E3}</UniqueIdentifier>
     </Filter>
@@ -1252,6 +1249,15 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.cpp">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClCompile>
@@ -1366,9 +1372,6 @@
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\documents\juce_FileBasedDocument.cpp">
       <Filter>Juce Modules\juce_gui_extra\documents</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClCompile>
@@ -2613,6 +2616,15 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h">
       <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h">
+      <Filter>Juce Modules\juce_gui_basics\lookandfeel</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.h">
       <Filter>Juce Modules\juce_gui_basics\filebrowser</Filter>
     </ClInclude>
@@ -2712,9 +2724,6 @@
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h">
       <Filter>Juce Modules\juce_gui_extra\embedding</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h">
-      <Filter>Juce Modules\juce_gui_extra\lookandfeel</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h">
       <Filter>Juce Modules\juce_gui_extra\misc</Filter>
     </ClInclude>

extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj

@@ -204,6 +204,7 @@
 		47BB119E08A7A1A468564B9D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		47D12441679F0062EB7C96AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
 		48D212A6051005FB7A4BC338 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageFileFormat.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageFileFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		492FBEED85D887CC01080068 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		495652C9E6B06C891281D040 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PreferencesPanel.h"; path = "../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.h"; sourceTree = "SOURCE_ROOT"; };
 		4961AA10B3563523AE1B0BFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileChooserDialogBox.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h"; sourceTree = "SOURCE_ROOT"; };
 		498778ED99DF1BA68A6E3A18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XmlDocument.cpp"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -211,12 +212,12 @@
 		4A20547D0C763ABB1DE5A9C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Slider.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.h"; sourceTree = "SOURCE_ROOT"; };
 		4A5ED88CC2ED6ADD8A5B102A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Result.h"; path = "../../../../modules/juce_core/misc/juce_Result.h"; sourceTree = "SOURCE_ROOT"; };
 		4A8C64BB96FB93919DDF2166 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
+		4AA6BD2A3FDFADDCB0322F9C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4C34CB4DC542D86A193C055A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RenderingHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_RenderingHelpers.h"; sourceTree = "SOURCE_ROOT"; };
 		4CC331BEE18B3EC4BADF38CE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Colours.h"; path = "../../../../modules/juce_graphics/colour/juce_Colours.h"; sourceTree = "SOURCE_ROOT"; };
 		4D44E9AD19469774ED8245B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CodeEditorComponent.cpp"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4D6C90354134741F7F295412 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4DD07E53E4ABDE534D34981E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; };
-		4E070ED86B9A6F220123EBEB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		4E1058572E25FD04B7D60700 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		4E2E741BA1779C70049641D0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Image.cpp"; path = "../../../../modules/juce_graphics/images/juce_Image.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4FF67CE1DFACAFF545D8E9AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GraphicsContext.cpp"; path = "../../../../modules/juce_graphics/contexts/juce_GraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -311,6 +312,7 @@
 		71D7F3CED9D84ECF00E3C7DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableShape.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableShape.cpp"; sourceTree = "SOURCE_ROOT"; };
 		71D8C3F48801BEF5DB86B619 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ModalComponentManager.h"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.h"; sourceTree = "SOURCE_ROOT"; };
 		71EA769D5757AB3B16E5E6E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
+		7224FBF6C8769342A0E3AC71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		732EB7C9CF8E817B7239DBA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; };
 		7402FA767F4FD9CCD3DD1578 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_graphics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		744475CFFBA91FDA03DDF659 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CPlusPlusCodeTokeniserFunctions.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h"; sourceTree = "SOURCE_ROOT"; };
@@ -320,7 +322,6 @@
 		755B3410E5F1D6CD7CA350E0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComboBox.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ComboBox.cpp"; sourceTree = "SOURCE_ROOT"; };
 		774896BADE9613608E2A1EFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; };
 		786ABCE38FCC63E58ED44C5B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Threads.cpp"; path = "../../../../modules/juce_core/native/juce_android_Threads.cpp"; sourceTree = "SOURCE_ROOT"; };
-		789AF76E97BF2BA51A082381 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		793CDD14387F49E8757B9042 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ValueTree.cpp"; path = "../../../../modules/juce_data_structures/values/juce_ValueTree.cpp"; sourceTree = "SOURCE_ROOT"; };
 		79A4F1CF3FB5D20104693598 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; };
 		7A6E2A815D9AE276CF064A24 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemTrayIconComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -336,6 +337,7 @@
 		7D41725B59E3415350C8E035 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBrowserListener.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h"; sourceTree = "SOURCE_ROOT"; };
 		7D87E3CB6613ADCE674B00BE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Files.cpp"; path = "../../../../modules/juce_core/native/juce_android_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7E6FE81AB4D5B08FF0F4E8AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InputSource.h"; path = "../../../../modules/juce_core/streams/juce_InputSource.h"; sourceTree = "SOURCE_ROOT"; };
+		7E8133ED13638E1D0C6F849F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7E9061B22520E892C910ECC9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FilenameComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7EBAA8C6B6447AC1707EA1A7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_win32_HiddenMessageWindow.h"; path = "../../../../modules/juce_events/native/juce_win32_HiddenMessageWindow.h"; sourceTree = "SOURCE_ROOT"; };
 		7EE080AF681F1D927DF35B95 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -405,6 +407,7 @@
 		9F3BAC34BBE550826A0C2B4D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; };
 		9F994395393E0BFB8A320B04 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Files.mm"; path = "../../../../modules/juce_core/native/juce_mac_Files.mm"; sourceTree = "SOURCE_ROOT"; };
 		9FBFACCA56589CDCC3D78F0E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadPool.cpp"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.cpp"; sourceTree = "SOURCE_ROOT"; };
+		A0816F5D3CB1D0509C714252 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		A1637DEBD3438ACB0D7F48E0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Colour.cpp"; path = "../../../../modules/juce_graphics/colour/juce_Colour.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A16B3D0EA58919EDAEB08792 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MouseEvent.cpp"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseEvent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A16DA9030A96B26C6BF52FDC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"; sourceTree = "SOURCE_ROOT"; };
@@ -511,6 +514,7 @@
 		C511170BCB0784C896826010 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C5401AF900EB8056416C1294 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		C546B9AC32E553D5969B2537 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Initialisation.h"; path = "../../../../modules/juce_events/messages/juce_Initialisation.h"; sourceTree = "SOURCE_ROOT"; };
+		C56DB2DC67E1DBA6C29044CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C626FA20C4D021076A4B943E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		C6313E766ECDCE48435BA5A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPositionBehaviours.h"; path = "../../../../modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h"; sourceTree = "SOURCE_ROOT"; };
 		C63DB03ADC0A6E3C45DD88C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Image.h"; path = "../../../../modules/juce_graphics/images/juce_Image.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1250,7 +1254,13 @@
 				5BFC164CB4F8BC4FD839EDC8 ); name = properties; sourceTree = "<group>"; };
 		0497AE7C3FF9222448CEC17B = { isa = PBXGroup; children = (
 				9D0323FECB030B06FBD0F627,
-				01A853C55CAE8341C207A758 ); name = lookandfeel; sourceTree = "<group>"; };
+				01A853C55CAE8341C207A758,
+				7E8133ED13638E1D0C6F849F,
+				A0816F5D3CB1D0509C714252,
+				C56DB2DC67E1DBA6C29044CD,
+				492FBEED85D887CC01080068,
+				4AA6BD2A3FDFADDCB0322F9C,
+				7224FBF6C8769342A0E3AC71 ); name = lookandfeel; sourceTree = "<group>"; };
 		B0DA666A72BF97CE5C6452EA = { isa = PBXGroup; children = (
 				4D6C90354134741F7F295412,
 				D06CEB2AEDFB98E1406E06F7,
@@ -1349,10 +1359,7 @@
 				6C632E34FD1B617525987657,
 				02C0DD7DC29B27B39D5FF154,
 				DD10783090721EFE21E4FAA5 ); name = embedding; sourceTree = "<group>"; };
-		A959C42FC6A939D354E54F51 = { isa = PBXGroup; children = (
-				789AF76E97BF2BA51A082381,
-				4E070ED86B9A6F220123EBEB ); name = lookandfeel; sourceTree = "<group>"; };
-		5FAF2B3A5F0D2749C8433FBF = { isa = PBXGroup; children = (
+		F4FF39023AE719A2C1FDFCF6 = { isa = PBXGroup; children = (
 				74AB579ADDC7C355C5704A16,
 				CB713D4A63E08276975B7639,
 				5E2CB1D4DC6ED933AA81C43A,
@@ -1369,7 +1376,7 @@
 				7A6E2A815D9AE276CF064A24,
 				8C439BE182790867BCC9ADFC,
 				1F4C7ECC97B4C80BD98F32C1 ); name = misc; sourceTree = "<group>"; };
-		37FA23CC7AC1F16EB87F4DF8 = { isa = PBXGroup; children = (
+		E145BB5F87254EDB7C912760 = { isa = PBXGroup; children = (
 				118B13BE32C7FDCE82BDC495,
 				939EC86DADE3927918AA327C,
 				8FA331691E39F5D8FB0DCDF8,
@@ -1386,9 +1393,8 @@
 				E40525D81D015389B0388510,
 				7A7F0DF75E9B01FE9A9470B2,
 				5339003A04D05F6E3F333436,
-				A959C42FC6A939D354E54F51,
-				5FAF2B3A5F0D2749C8433FBF,
-				37FA23CC7AC1F16EB87F4DF8,
+				F4FF39023AE719A2C1FDFCF6,
+				E145BB5F87254EDB7C912760,
 				8FBE4F804ECCBADAA37592F0,
 				C001B0F67BB17E32A3BC8F92 ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		C37CC96B89E62143A0E75336 = { isa = PBXGroup; children = (

extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj

@@ -2741,6 +2741,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -3120,19 +3153,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj

@@ -2741,6 +2741,39 @@
             </FileConfiguration>
           </File>
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V1.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V2.h"/>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.cpp">
+            <FileConfiguration Name="Debug|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+            <FileConfiguration Name="Release|Win32"
+                               ExcludedFromBuild="true">
+              <Tool Name="VCCLCompilerTool"/>
+            </FileConfiguration>
+          </File>
+          <File RelativePath="..\..\..\..\modules\juce_gui_basics\lookandfeel\juce_LookAndFeel_V3.h"/>
         </Filter>
         <Filter Name="filebrowser">
           <File RelativePath="..\..\..\..\modules\juce_gui_basics\filebrowser\juce_DirectoryContentsDisplayComponent.cpp">
@@ -3120,19 +3153,6 @@
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_NSViewComponent.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\embedding\juce_UIViewComponent.h"/>
         </Filter>
-        <Filter Name="lookandfeel">
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_gui_extra\lookandfeel\juce_OldSchoolLookAndFeel.h"/>
-        </Filter>
         <Filter Name="misc">
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_AppleRemote.h"/>
           <File RelativePath="..\..\..\..\modules\juce_gui_extra\misc\juce_BubbleMessageComponent.cpp">

extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj

@@ -202,6 +202,7 @@
 		47BB119E08A7A1A468564B9D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		47D12441679F0062EB7C96AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BasicNativeHeaders.h"; path = "../../../../modules/juce_core/native/juce_BasicNativeHeaders.h"; sourceTree = "SOURCE_ROOT"; };
 		48D212A6051005FB7A4BC338 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageFileFormat.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageFileFormat.cpp"; sourceTree = "SOURCE_ROOT"; };
+		492FBEED85D887CC01080068 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V2.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h"; sourceTree = "SOURCE_ROOT"; };
 		495652C9E6B06C891281D040 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PreferencesPanel.h"; path = "../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.h"; sourceTree = "SOURCE_ROOT"; };
 		4961AA10B3563523AE1B0BFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileChooserDialogBox.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.h"; sourceTree = "SOURCE_ROOT"; };
 		498778ED99DF1BA68A6E3A18 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_XmlDocument.cpp"; path = "../../../../modules/juce_core/xml/juce_XmlDocument.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -209,12 +210,12 @@
 		4A20547D0C763ABB1DE5A9C4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Slider.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.h"; sourceTree = "SOURCE_ROOT"; };
 		4A5ED88CC2ED6ADD8A5B102A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Result.h"; path = "../../../../modules/juce_core/misc/juce_Result.h"; sourceTree = "SOURCE_ROOT"; };
 		4A8C64BB96FB93919DDF2166 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
+		4AA6BD2A3FDFADDCB0322F9C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V3.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4C34CB4DC542D86A193C055A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RenderingHelpers.h"; path = "../../../../modules/juce_graphics/native/juce_RenderingHelpers.h"; sourceTree = "SOURCE_ROOT"; };
 		4CC331BEE18B3EC4BADF38CE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Colours.h"; path = "../../../../modules/juce_graphics/colour/juce_Colours.h"; sourceTree = "SOURCE_ROOT"; };
 		4D44E9AD19469774ED8245B2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CodeEditorComponent.cpp"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4D6C90354134741F7F295412 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DirectoryContentsDisplayComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_DirectoryContentsDisplayComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4DD07E53E4ABDE534D34981E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_HyperlinkButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_HyperlinkButton.h"; sourceTree = "SOURCE_ROOT"; };
-		4E070ED86B9A6F220123EBEB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_OldSchoolLookAndFeel.h"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h"; sourceTree = "SOURCE_ROOT"; };
 		4E1058572E25FD04B7D60700 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_Windowing.mm"; path = "../../../../modules/juce_gui_basics/native/juce_ios_Windowing.mm"; sourceTree = "SOURCE_ROOT"; };
 		4E2E741BA1779C70049641D0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Image.cpp"; path = "../../../../modules/juce_graphics/images/juce_Image.cpp"; sourceTree = "SOURCE_ROOT"; };
 		4FF67CE1DFACAFF545D8E9AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_GraphicsContext.cpp"; path = "../../../../modules/juce_graphics/contexts/juce_GraphicsContext.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -308,6 +309,7 @@
 		71D7F3CED9D84ECF00E3C7DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DrawableShape.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_DrawableShape.cpp"; sourceTree = "SOURCE_ROOT"; };
 		71D8C3F48801BEF5DB86B619 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ModalComponentManager.h"; path = "../../../../modules/juce_gui_basics/components/juce_ModalComponentManager.h"; sourceTree = "SOURCE_ROOT"; };
 		71EA769D5757AB3B16E5E6E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_InterprocessConnectionServer.cpp"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.cpp"; sourceTree = "SOURCE_ROOT"; };
+		7224FBF6C8769342A0E3AC71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V3.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h"; sourceTree = "SOURCE_ROOT"; };
 		732EB7C9CF8E817B7239DBA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_TreeView.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_TreeView.h"; sourceTree = "SOURCE_ROOT"; };
 		7402FA767F4FD9CCD3DD1578 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_graphics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		744475CFFBA91FDA03DDF659 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CPlusPlusCodeTokeniserFunctions.h"; path = "../../../../modules/juce_gui_extra/code_editor/juce_CPlusPlusCodeTokeniserFunctions.h"; sourceTree = "SOURCE_ROOT"; };
@@ -317,7 +319,6 @@
 		755B3410E5F1D6CD7CA350E0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComboBox.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ComboBox.cpp"; sourceTree = "SOURCE_ROOT"; };
 		774896BADE9613608E2A1EFE = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DragAndDropTarget.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_DragAndDropTarget.h"; sourceTree = "SOURCE_ROOT"; };
 		786ABCE38FCC63E58ED44C5B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Threads.cpp"; path = "../../../../modules/juce_core/native/juce_android_Threads.cpp"; sourceTree = "SOURCE_ROOT"; };
-		789AF76E97BF2BA51A082381 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_OldSchoolLookAndFeel.cpp"; path = "../../../../modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp"; sourceTree = "SOURCE_ROOT"; };
 		793CDD14387F49E8757B9042 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ValueTree.cpp"; path = "../../../../modules/juce_data_structures/values/juce_ValueTree.cpp"; sourceTree = "SOURCE_ROOT"; };
 		79A4F1CF3FB5D20104693598 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_WindowsRegistry.h"; path = "../../../../modules/juce_core/misc/juce_WindowsRegistry.h"; sourceTree = "SOURCE_ROOT"; };
 		7A6E2A815D9AE276CF064A24 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SystemTrayIconComponent.cpp"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -333,6 +334,7 @@
 		7D41725B59E3415350C8E035 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileBrowserListener.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileBrowserListener.h"; sourceTree = "SOURCE_ROOT"; };
 		7D87E3CB6613ADCE674B00BE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Files.cpp"; path = "../../../../modules/juce_core/native/juce_android_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7E6FE81AB4D5B08FF0F4E8AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InputSource.h"; path = "../../../../modules/juce_core/streams/juce_InputSource.h"; sourceTree = "SOURCE_ROOT"; };
+		7E8133ED13638E1D0C6F849F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V1.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7E9061B22520E892C910ECC9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FilenameComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FilenameComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		7EBAA8C6B6447AC1707EA1A7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_win32_HiddenMessageWindow.h"; path = "../../../../modules/juce_events/native/juce_win32_HiddenMessageWindow.h"; sourceTree = "SOURCE_ROOT"; };
 		7EE080AF681F1D927DF35B95 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -402,6 +404,7 @@
 		9F3BAC34BBE550826A0C2B4D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_SVGParser.cpp"; path = "../../../../modules/juce_gui_basics/drawables/juce_SVGParser.cpp"; sourceTree = "SOURCE_ROOT"; };
 		9F994395393E0BFB8A320B04 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_Files.mm"; path = "../../../../modules/juce_core/native/juce_mac_Files.mm"; sourceTree = "SOURCE_ROOT"; };
 		9FBFACCA56589CDCC3D78F0E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadPool.cpp"; path = "../../../../modules/juce_core/threads/juce_ThreadPool.cpp"; sourceTree = "SOURCE_ROOT"; };
+		A0816F5D3CB1D0509C714252 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_LookAndFeel_V1.h"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h"; sourceTree = "SOURCE_ROOT"; };
 		A1637DEBD3438ACB0D7F48E0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Colour.cpp"; path = "../../../../modules/juce_graphics/colour/juce_Colour.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A16B3D0EA58919EDAEB08792 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MouseEvent.cpp"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseEvent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		A16DA9030A96B26C6BF52FDC = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"; sourceTree = "SOURCE_ROOT"; };
@@ -508,6 +511,7 @@
 		C511170BCB0784C896826010 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Label.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_Label.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C5401AF900EB8056416C1294 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ContainerDeletePolicy.h"; path = "../../../../modules/juce_core/memory/juce_ContainerDeletePolicy.h"; sourceTree = "SOURCE_ROOT"; };
 		C546B9AC32E553D5969B2537 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Initialisation.h"; path = "../../../../modules/juce_events/messages/juce_Initialisation.h"; sourceTree = "SOURCE_ROOT"; };
+		C56DB2DC67E1DBA6C29044CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		C626FA20C4D021076A4B943E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_MainMenu.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_MainMenu.mm"; sourceTree = "SOURCE_ROOT"; };
 		C6313E766ECDCE48435BA5A0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AnimatedPositionBehaviours.h"; path = "../../../../modules/juce_gui_basics/layout/juce_AnimatedPositionBehaviours.h"; sourceTree = "SOURCE_ROOT"; };
 		C63DB03ADC0A6E3C45DD88C9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Image.h"; path = "../../../../modules/juce_graphics/images/juce_Image.h"; sourceTree = "SOURCE_ROOT"; };
@@ -1248,7 +1252,13 @@
 				5BFC164CB4F8BC4FD839EDC8 ); name = properties; sourceTree = "<group>"; };
 		0497AE7C3FF9222448CEC17B = { isa = PBXGroup; children = (
 				9D0323FECB030B06FBD0F627,
-				01A853C55CAE8341C207A758 ); name = lookandfeel; sourceTree = "<group>"; };
+				01A853C55CAE8341C207A758,
+				7E8133ED13638E1D0C6F849F,
+				A0816F5D3CB1D0509C714252,
+				C56DB2DC67E1DBA6C29044CD,
+				492FBEED85D887CC01080068,
+				4AA6BD2A3FDFADDCB0322F9C,
+				7224FBF6C8769342A0E3AC71 ); name = lookandfeel; sourceTree = "<group>"; };
 		B0DA666A72BF97CE5C6452EA = { isa = PBXGroup; children = (
 				4D6C90354134741F7F295412,
 				D06CEB2AEDFB98E1406E06F7,
@@ -1347,10 +1357,7 @@
 				6C632E34FD1B617525987657,
 				02C0DD7DC29B27B39D5FF154,
 				DD10783090721EFE21E4FAA5 ); name = embedding; sourceTree = "<group>"; };
-		A959C42FC6A939D354E54F51 = { isa = PBXGroup; children = (
-				789AF76E97BF2BA51A082381,
-				4E070ED86B9A6F220123EBEB ); name = lookandfeel; sourceTree = "<group>"; };
-		5FAF2B3A5F0D2749C8433FBF = { isa = PBXGroup; children = (
+		F4FF39023AE719A2C1FDFCF6 = { isa = PBXGroup; children = (
 				74AB579ADDC7C355C5704A16,
 				CB713D4A63E08276975B7639,
 				5E2CB1D4DC6ED933AA81C43A,
@@ -1367,7 +1374,7 @@
 				7A6E2A815D9AE276CF064A24,
 				8C439BE182790867BCC9ADFC,
 				1F4C7ECC97B4C80BD98F32C1 ); name = misc; sourceTree = "<group>"; };
-		37FA23CC7AC1F16EB87F4DF8 = { isa = PBXGroup; children = (
+		E145BB5F87254EDB7C912760 = { isa = PBXGroup; children = (
 				118B13BE32C7FDCE82BDC495,
 				939EC86DADE3927918AA327C,
 				8FA331691E39F5D8FB0DCDF8,
@@ -1384,9 +1391,8 @@
 				E40525D81D015389B0388510,
 				7A7F0DF75E9B01FE9A9470B2,
 				5339003A04D05F6E3F333436,
-				A959C42FC6A939D354E54F51,
-				5FAF2B3A5F0D2749C8433FBF,
-				37FA23CC7AC1F16EB87F4DF8,
+				F4FF39023AE719A2C1FDFCF6,
+				E145BB5F87254EDB7C912760,
 				8FBE4F804ECCBADAA37592F0,
 				C001B0F67BB17E32A3BC8F92 ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		C37CC96B89E62143A0E75336 = { isa = PBXGroup; children = (

modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp

@@ -380,7 +380,7 @@ public:
             samplesToWrite = const_cast<const int**> (channels.getData());
         }
 
-        return FLAC__stream_encoder_process (encoder, (const FLAC__int32**) samplesToWrite, (size_t) numSamples) != 0;
+        return FLAC__stream_encoder_process (encoder, (const FLAC__int32**) samplesToWrite, (unsigned) numSamples) != 0;
     }
 
     bool writeData (const void* const data, const int size) const

modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp

@@ -186,7 +186,7 @@ public:
                 {
                     float** dataIn = nullptr;
 
-                    const int samps = OggVorbisNamespace::ov_read_float (&ovFile, &dataIn, numToRead, &bitStream);
+                    const long samps = OggVorbisNamespace::ov_read_float (&ovFile, &dataIn, numToRead, &bitStream);
                     if (samps <= 0)
                         break;
 

modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

@@ -1675,8 +1675,8 @@ private:
     void setHostTimeFrameRate (long frameRateIndex, double frameRate, double currentTime) noexcept
     {
         vstHostTime.flags |= kVstSmpteValid;
-        vstHostTime.smpteFrameRate  = frameRateIndex;
-        vstHostTime.smpteOffset     = (long) (currentTime * 80.0 * frameRate + 0.5);
+        vstHostTime.smpteFrameRate  = (VstInt32) frameRateIndex;
+        vstHostTime.smpteOffset     = (VstInt32) (currentTime * 80.0 * frameRate + 0.5);
     }
 
     bool restoreProgramSettings (const fxProgram* const prog)

modules/juce_core/native/juce_mac_Network.mm

@@ -220,7 +220,7 @@ public:
         initialised = true;
     }
 
-    void didSendBodyData (int /*totalBytesWritten*/, int /*totalBytesExpected*/)
+    void didSendBodyData (NSInteger /*totalBytesWritten*/, NSInteger /*totalBytesExpected*/)
     {
     }
 

modules/juce_core/xml/juce_XmlElement.h

@@ -519,12 +519,12 @@ public:
         make sure the object that you pass in will not be deleted by anything else,
         and make sure it's not already the child of another element.
 
-        @param newChildNode     the element to add
+        @param newChildElement  the element to add
         @param indexToInsertAt  the index at which to insert the new element - if this is
                                 below zero, it will be added to the end of the list
         @see addChildElement, insertChildElement
     */
-    void insertChildElement (XmlElement* newChildNode,
+    void insertChildElement (XmlElement* newChildElement,
                              int indexToInsertAt) noexcept;
 
     /** Inserts an element at the beginning of this element's list of children.
@@ -537,7 +537,6 @@ public:
         is an O(1) operation, but addChildElement() is an O(N) operation - so if
         you're adding large number of elements, you may prefer to do so in reverse order!
 
-        @param newChildNode     the element to add
         @see addChildElement, insertChildElement
     */
     void prependChildElement (XmlElement* newChildElement) noexcept;

modules/juce_graphics/native/juce_mac_Fonts.mm

@@ -340,7 +340,7 @@ namespace CoreTextTypeLayout
         CFArrayRef lines = CTFrameGetLines (frame);
         const CFIndex numLines = CFArrayGetCount (lines);
 
-        glyphLayout.ensureStorageAllocated (numLines);
+        glyphLayout.ensureStorageAllocated ((int) numLines);
 
         for (CFIndex i = 0; i < numLines; ++i)
         {

modules/juce_gui_basics/buttons/juce_Button.h

@@ -355,6 +355,33 @@ public:
     // This method's parameters have changed - see the new version.
     JUCE_DEPRECATED (void setToggleState (bool, bool));
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        button-drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawButtonBackground (Graphics&, Button& button, const Colour& backgroundColour,
+                                           bool isMouseOverButton, bool isButtonDown) = 0;
+
+        virtual Font getTextButtonFont (TextButton& button) = 0;
+
+        /** Draws the text for a TextButton. */
+        virtual void drawButtonText (Graphics&, TextButton&, bool isMouseOverButton, bool isButtonDown) = 0;
+
+        /** Draws the contents of a standard ToggleButton. */
+        virtual void drawToggleButton (Graphics&, ToggleButton&, bool isMouseOverButton, bool isButtonDown) = 0;
+
+        virtual void changeToggleButtonWidthToFitText (ToggleButton&) = 0;
+
+        virtual void drawTickBox (Graphics&, Component&, float x, float y, float w, float h,
+                                  bool ticked, bool isEnabled, bool isMouseOverButton, bool isButtonDown) = 0;
+
+        virtual void drawDrawableButton (Graphics&, DrawableButton&, bool isMouseOverButton, bool isButtonDown) = 0;
+    };
+
 protected:
     //==============================================================================
     /** This method is called when the button has been clicked.

modules/juce_gui_basics/buttons/juce_ImageButton.h

@@ -124,6 +124,17 @@ public:
     */
     Image getDownImage() const;
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawImageButton (Graphics&, Image*,
+                                      int imageX, int imageY, int imageW, int imageH,
+                                      const Colour& overlayColour, float imageOpacity, ImageButton&) = 0;
+    };
+
 protected:
     //==============================================================================
     /** @internal */

modules/juce_gui_basics/components/juce_Desktop.cpp

@@ -89,7 +89,7 @@ LookAndFeel& Desktop::getDefaultLookAndFeel() noexcept
     if (currentLookAndFeel == nullptr)
     {
         if (defaultLookAndFeel == nullptr)
-            defaultLookAndFeel = new LookAndFeel();
+            defaultLookAndFeel = new LookAndFeel_V2();
 
         currentLookAndFeel = defaultLookAndFeel;
     }

modules/juce_gui_basics/filebrowser/juce_FileBrowserComponent.h

@@ -177,6 +177,42 @@ public:
     */
     static void getDefaultRoots (StringArray& rootNames, StringArray& rootPaths);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        various file-browser layout and drawing methods.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        // These return a pointer to an internally cached drawable - make sure you don't keep
+        // a copy of this pointer anywhere, as it may become invalid in the future.
+        virtual const Drawable* getDefaultFolderImage() = 0;
+        virtual const Drawable* getDefaultDocumentFileImage() = 0;
+
+        virtual AttributedString createFileChooserHeaderText (const String& title,
+                                                              const String& instructions) = 0;
+
+        virtual void drawFileBrowserRow (Graphics&, int width, int height,
+                                         const String& filename,
+                                         Image* optionalIcon,
+                                         const String& fileSizeDescription,
+                                         const String& fileTimeDescription,
+                                         bool isDirectory,
+                                         bool isItemSelected,
+                                         int itemIndex,
+                                         DirectoryContentsDisplayComponent&) = 0;
+
+        virtual Button* createFileBrowserGoUpButton() = 0;
+
+        virtual void layoutFileBrowserComponent (FileBrowserComponent& browserComp,
+                                                 DirectoryContentsDisplayComponent* fileListComponent,
+                                                 FilePreviewComponent* previewComp,
+                                                 ComboBox* currentPathBox,
+                                                 TextEditor* filenameBox,
+                                                 Button* goUpButton) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void resized() override;

modules/juce_gui_basics/filebrowser/juce_FilenameComponent.h

@@ -180,6 +180,16 @@ public:
     /** Gives the component a tooltip. */
     void setTooltip (const String& newTooltip) override;
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual Button* createFilenameComponentBrowseButton (const String& text) = 0;
+        virtual void layoutFilenameComponent (FilenameComponent&, ComboBox* filenameBox, Button* browseButton) =  0;
+    };
+
     //==============================================================================
     /** @internal */
     void paintOverChildren (Graphics&) override;

modules/juce_gui_basics/juce_gui_basics.cpp

@@ -198,6 +198,9 @@ extern bool juce_areThereAnyAlwaysOnTopWindows();
 #include "layout/juce_TabbedComponent.cpp"
 #include "layout/juce_Viewport.cpp"
 #include "lookandfeel/juce_LookAndFeel.cpp"
+#include "lookandfeel/juce_LookAndFeel_V2.cpp"
+#include "lookandfeel/juce_LookAndFeel_V1.cpp"
+#include "lookandfeel/juce_LookAndFeel_V3.cpp"
 #include "menus/juce_MenuBarComponent.cpp"
 #include "menus/juce_MenuBarModel.cpp"
 #include "menus/juce_PopupMenu.cpp"

modules/juce_gui_basics/juce_gui_basics.h

@@ -113,6 +113,7 @@ class CaretComponent;
 class BubbleComponent;
 class KeyPressMappingSet;
 class ApplicationCommandManagerListener;
+class DrawableButton;
 
 #include "mouse/juce_MouseCursor.h"
 #include "mouse/juce_MouseListener.h"
@@ -215,7 +216,6 @@ class ApplicationCommandManagerListener;
 #include "windows/juce_ThreadWithProgressWindow.h"
 #include "windows/juce_TooltipWindow.h"
 #include "layout/juce_MultiDocumentPanel.h"
-#include "lookandfeel/juce_LookAndFeel.h"
 #include "filebrowser/juce_FileFilter.h"
 #include "filebrowser/juce_WildcardFileFilter.h"
 #include "filebrowser/juce_FileBrowserListener.h"
@@ -239,6 +239,10 @@ class ApplicationCommandManagerListener;
 #include "properties/juce_TextPropertyComponent.h"
 #include "application/juce_Application.h"
 #include "misc/juce_BubbleComponent.h"
+#include "lookandfeel/juce_LookAndFeel.h"
+#include "lookandfeel/juce_LookAndFeel_V2.h"
+#include "lookandfeel/juce_LookAndFeel_V1.h"
+#include "lookandfeel/juce_LookAndFeel_V3.h"
 
 }
 

modules/juce_gui_basics/layout/juce_ConcertinaPanel.h

@@ -93,6 +93,16 @@ public:
     /** Sets the height of the header section for one of the panels. */
     void setPanelHeaderSize (Component* panelComponent, int headerSize);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>& area,
+                                                bool isMouseOver, bool isMouseDown, ConcertinaPanel&, Component&) = 0;
+    };
+
 private:
     void resized() override;
 

modules/juce_gui_basics/layout/juce_GroupComponent.cpp

@@ -31,11 +31,8 @@ GroupComponent::GroupComponent (const String& name,
     setInterceptsMouseClicks  (false, true);
 }
 
-GroupComponent::~GroupComponent()
-{
-}
+GroupComponent::~GroupComponent() {}
 
-//==============================================================================
 void GroupComponent::setText (const String& newText)
 {
     if (text != newText)
@@ -50,7 +47,6 @@ String GroupComponent::getText() const
     return text;
 }
 
-//==============================================================================
 void GroupComponent::setTextLabelPosition (Justification newJustification)
 {
     if (justification != newJustification)
@@ -62,18 +58,9 @@ void GroupComponent::setTextLabelPosition (Justification newJustification)
 
 void GroupComponent::paint (Graphics& g)
 {
-    getLookAndFeel()
-        .drawGroupComponentOutline (g, getWidth(), getHeight(),
-                                    text, justification,
-                                    *this);
+    getLookAndFeel().drawGroupComponentOutline (g, getWidth(), getHeight(),
+                                                text, justification, *this);
 }
 
-void GroupComponent::enablementChanged()
-{
-    repaint();
-}
-
-void GroupComponent::colourChanged()
-{
-    repaint();
-}
+void GroupComponent::enablementChanged()    { repaint(); }
+void GroupComponent::colourChanged()        { repaint(); }

modules/juce_gui_basics/layout/juce_GroupComponent.h

@@ -82,6 +82,16 @@ public:
         textColourId        = 0x1005410     /**< The colour to use to draw the text label. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawGroupComponentOutline (Graphics&, int w, int h, const String& text,
+                                                const Justification&, GroupComponent&) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/layout/juce_ScrollBar.h

@@ -292,6 +292,73 @@ public:
     /** Deregisters a previously-registered listener. */
     void removeListener (Listener* listener);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        scrollbar-drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual bool areScrollbarButtonsVisible() = 0;
+
+        /** Draws one of the buttons on a scrollbar.
+
+            @param g                    the context to draw into
+            @param scrollbar            the bar itself
+            @param width                the width of the button
+            @param height               the height of the button
+            @param buttonDirection      the direction of the button, where 0 = up, 1 = right, 2 = down, 3 = left
+            @param isScrollbarVertical  true if it's a vertical bar, false if horizontal
+            @param isMouseOverButton    whether the mouse is currently over the button (also true if it's held down)
+            @param isButtonDown         whether the mouse button's held down
+        */
+        virtual void drawScrollbarButton (Graphics& g,
+                                          ScrollBar& scrollbar,
+                                          int width, int height,
+                                          int buttonDirection,
+                                          bool isScrollbarVertical,
+                                          bool isMouseOverButton,
+                                          bool isButtonDown) = 0;
+
+        /** Draws the thumb area of a scrollbar.
+
+            @param g                    the context to draw into
+            @param scrollbar            the bar itself
+            @param x                    the x position of the left edge of the thumb area to draw in
+            @param y                    the y position of the top edge of the thumb area to draw in
+            @param width                the width of the thumb area to draw in
+            @param height               the height of the thumb area to draw in
+            @param isScrollbarVertical  true if it's a vertical bar, false if horizontal
+            @param thumbStartPosition   for vertical bars, the y coordinate of the top of the
+                                        thumb, or its x position for horizontal bars
+            @param thumbSize            for vertical bars, the height of the thumb, or its width for
+                                        horizontal bars. This may be 0 if the thumb shouldn't be drawn.
+            @param isMouseOver          whether the mouse is over the thumb area, also true if the mouse is
+                                        currently dragging the thumb
+            @param isMouseDown          whether the mouse is currently dragging the scrollbar
+        */
+        virtual void drawScrollbar (Graphics& g, ScrollBar& scrollbar,
+                                    int x, int y, int width, int height,
+                                    bool isScrollbarVertical,
+                                    int thumbStartPosition,
+                                    int thumbSize,
+                                    bool isMouseOver,
+                                    bool isMouseDown) = 0;
+
+        /** Returns the component effect to use for a scrollbar */
+        virtual ImageEffectFilter* getScrollbarEffect() = 0;
+
+        /** Returns the minimum length in pixels to use for a scrollbar thumb. */
+        virtual int getMinimumScrollbarThumbSize (ScrollBar&) = 0;
+
+        /** Returns the default thickness to use for a scrollbar. */
+        virtual int getDefaultScrollbarWidth() = 0;
+
+        /** Returns the length in pixels to use for a scrollbar button. */
+        virtual int getScrollbarButtonSize (ScrollBar&) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     bool keyPressed (const KeyPress&) override;

modules/juce_gui_basics/layout/juce_StretchableLayoutResizerBar.h

@@ -72,6 +72,16 @@ public:
     */
     virtual void hasBeenMoved();
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawStretchableLayoutResizerBar (Graphics&, int w, int h,
+                                                      bool isVerticalBar, bool isMouseOver, bool isMouseDragging) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/layout/juce_TabbedButtonBar.h

@@ -293,6 +293,30 @@ public:
                                                              colour. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        window drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual int getTabButtonSpaceAroundImage() = 0;
+        virtual int getTabButtonOverlap (int tabDepth) = 0;
+        virtual int getTabButtonBestWidth (TabBarButton&, int tabDepth) = 0;
+        virtual Rectangle<int> getTabButtonExtraComponentBounds (const TabBarButton&, Rectangle<int>& textArea, Component& extraComp) = 0;
+
+        virtual void drawTabButton (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown) = 0;
+        virtual void drawTabButtonText (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown) = 0;
+        virtual void drawTabbedButtonBarBackground (TabbedButtonBar&, Graphics&) = 0;
+        virtual void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int w, int h) = 0;
+
+        virtual void createTabButtonShape (TabBarButton&, Path& path,  bool isMouseOver, bool isMouseDown) = 0;
+        virtual void fillTabButtonShape (TabBarButton&, Graphics&, const Path& path, bool isMouseOver, bool isMouseDown) = 0;
+
+        virtual Button* createTabBarExtrasButton() = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h

@@ -25,14 +25,80 @@
 #ifndef JUCE_LOOKANDFEEL_H_INCLUDED
 #define JUCE_LOOKANDFEEL_H_INCLUDED
 
+//==============================================================================
+/** This class is used to hold a few look and feel base classes which are associated
+    with classes that may not be present because they're from modules other than
+    juce_gui_basics.
+*/
+struct JUCE_API  ExtraLookAndFeelBaseClasses
+{
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LassoComponentMethods
+    {
+        virtual ~LassoComponentMethods() {}
+
+        virtual void drawLasso (Graphics&, Component& lassoComp) = 0;
+    };
+
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  KeyMappingEditorComponentMethods
+    {
+        virtual ~KeyMappingEditorComponentMethods() {}
+
+        virtual void drawKeymapChangeButton (Graphics&, int width, int height, Button&, const String& keyDescription) = 0;
+    };
+
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  AudioDeviceSelectorComponentMethods
+    {
+        virtual ~AudioDeviceSelectorComponentMethods() {}
+
+        virtual void drawLevelMeter (Graphics&, int width, int height, float level) = 0;
+    };
+};
+
 
 //==============================================================================
 /**
     LookAndFeel objects define the appearance of all the JUCE widgets, and subclasses
     can be used to apply different 'skins' to the application.
 
+    This class is an abstract base-class - for actual look-and-feels that you can
+    instantiate, see LookAndFeel_V1, LookAndFeel_V2 and LookAndFeel_V3.
+
+    @see LookAndFeel_V1, LookAndFeel_V2, LookAndFeel_V3
 */
-class JUCE_API  LookAndFeel
+class JUCE_API  LookAndFeel   : public ScrollBar::LookAndFeelMethods,
+                                public Button::LookAndFeelMethods,
+                                public ImageButton::LookAndFeelMethods,
+                                public TextEditor::LookAndFeelMethods,
+                                public FileBrowserComponent::LookAndFeelMethods,
+                                public TreeView::LookAndFeelMethods,
+                                public BubbleComponent::LookAndFeelMethods,
+                                public AlertWindow::LookAndFeelMethods,
+                                public PopupMenu::LookAndFeelMethods,
+                                public ComboBox::LookAndFeelMethods,
+                                public Label::LookAndFeelMethods,
+                                public Slider::LookAndFeelMethods,
+                                public ResizableWindow::LookAndFeelMethods,
+                                public DocumentWindow::LookAndFeelMethods,
+                                public TooltipWindow::LookAndFeelMethods,
+                                public TabbedButtonBar::LookAndFeelMethods,
+                                public PropertyComponent::LookAndFeelMethods,
+                                public FilenameComponent::LookAndFeelMethods,
+                                public GroupComponent::LookAndFeelMethods,
+                                public TableHeaderComponent::LookAndFeelMethods,
+                                public CallOutBox::LookAndFeelMethods,
+                                public Toolbar::LookAndFeelMethods,
+                                public ConcertinaPanel::LookAndFeelMethods,
+                                public ProgressBar::LookAndFeelMethods,
+                                public StretchableLayoutResizerBar::LookAndFeelMethods,
+                                public ExtraLookAndFeelBaseClasses::KeyMappingEditorComponentMethods,
+                                public ExtraLookAndFeelBaseClasses::AudioDeviceSelectorComponentMethods,
+                                public ExtraLookAndFeelBaseClasses::LassoComponentMethods
 {
 public:
     //==============================================================================
@@ -60,7 +126,6 @@ public:
     */
     static void setDefaultLookAndFeel (LookAndFeel* newDefaultLookAndFeel) noexcept;
 
-
     //==============================================================================
     /** Looks for a colour that has been registered with the given colour ID number.
 
@@ -82,9 +147,7 @@ public:
     Colour findColour (int colourId) const noexcept;
 
     /** Registers a colour to be used for a particular purpose.
-
         For more details, see the comments for findColour().
-
         @see findColour, Component::findColour, Component::setColour
     */
     void setColour (int colourId, Colour colour) noexcept;
@@ -94,9 +157,12 @@ public:
     */
     bool isColourSpecified (int colourId) const noexcept;
 
-
     //==============================================================================
-    virtual Typeface::Ptr getTypefaceForFont (const Font& font);
+    /** Returns the typeface that should be used for a given font.
+        The default implementation just does what you'd expect it to, but you can override
+        this if you want to intercept fonts and use your own custom typeface object.
+    */
+    virtual Typeface::Ptr getTypefaceForFont (const Font&);
 
     /** Allows you to change the default sans-serif font.
 
@@ -110,510 +176,38 @@ public:
     /** Override this to get the chance to swap a component's mouse cursor for a
         customised one.
     */
-    virtual MouseCursor getMouseCursorFor (Component& component);
+    virtual MouseCursor getMouseCursorFor (Component&);
 
     //==============================================================================
-    // Creates a new graphics context object.
+    /** Creates a new graphics context object. */
     virtual LowLevelGraphicsContext* createGraphicsContext (const Image& imageToRenderOn,
                                                             const Point<int>& origin,
                                                             const RectangleList<int>& initialClip);
 
-    //==============================================================================
-    /** Draws the lozenge-shaped background for a standard button. */
-    virtual void drawButtonBackground (Graphics&,
-                                       Button& button,
-                                       const Colour& backgroundColour,
-                                       bool isMouseOverButton,
-                                       bool isButtonDown);
-
-    virtual Font getTextButtonFont (TextButton& button);
-
-    /** Draws the text for a TextButton. */
-    virtual void drawButtonText (Graphics&,
-                                 TextButton& button,
-                                 bool isMouseOverButton,
-                                 bool isButtonDown);
-
-    /** Draws the contents of a standard ToggleButton. */
-    virtual void drawToggleButton (Graphics&,
-                                   ToggleButton& button,
-                                   bool isMouseOverButton,
-                                   bool isButtonDown);
-
-    virtual void changeToggleButtonWidthToFitText (ToggleButton& button);
-
-    virtual void drawTickBox (Graphics&,
-                              Component& component,
-                              float x, float y, float w, float h,
-                              bool ticked,
-                              bool isEnabled,
-                              bool isMouseOverButton,
-                              bool isButtonDown);
-
-    virtual void drawDrawableButton (Graphics&,
-                                     DrawableButton& button,
-                                     bool isMouseOverButton,
-                                     bool isButtonDown);
-
-    //==============================================================================
-    // AlertWindow handling..
-
-    virtual AlertWindow* createAlertWindow (const String& title,
-                                            const String& message,
-                                            const String& button1,
-                                            const String& button2,
-                                            const String& button3,
-                                            AlertWindow::AlertIconType iconType,
-                                            int numButtons,
-                                            Component* associatedComponent);
-
-    virtual void drawAlertBox (Graphics&,
-                               AlertWindow& alert,
-                               const Rectangle<int>& textArea,
-                               TextLayout& textLayout);
-
-    virtual int getAlertBoxWindowFlags();
-
-    virtual int getAlertWindowButtonHeight();
-
-    virtual Font getAlertWindowMessageFont();
-    virtual Font getAlertWindowFont();
-
     void setUsingNativeAlertWindows (bool shouldUseNativeAlerts);
     bool isUsingNativeAlertWindows();
 
-    /** Draws a progress bar.
-
-        If the progress value is less than 0 or greater than 1.0, this should draw a spinning
-        bar that fills the whole space (i.e. to say that the app is still busy but the progress
-        isn't known). It can use the current time as a basis for playing an animation.
-
-        (Used by progress bars in AlertWindow).
-    */
-    virtual void drawProgressBar (Graphics&, ProgressBar& progressBar,
-                                  int width, int height,
-                                  double progress, const String& textToShow);
-
-    //==============================================================================
-    // Draws a small image that spins to indicate that something's happening..
-    // This method should use the current time to animate itself, so just keep
-    // repainting it every so often.
-    virtual void drawSpinningWaitAnimation (Graphics&, const Colour& colour,
-                                            int x, int y, int w, int h);
-
     //==============================================================================
-    virtual bool areScrollbarButtonsVisible();
-
-    /** Draws one of the buttons on a scrollbar.
-
-        @param g                    the context to draw into
-        @param scrollbar            the bar itself
-        @param width                the width of the button
-        @param height               the height of the button
-        @param buttonDirection      the direction of the button, where 0 = up, 1 = right, 2 = down, 3 = left
-        @param isScrollbarVertical  true if it's a vertical bar, false if horizontal
-        @param isMouseOverButton    whether the mouse is currently over the button (also true if it's held down)
-        @param isButtonDown         whether the mouse button's held down
+    /** Draws a small image that spins to indicate that something's happening.
+        This method should use the current time to animate itself, so just keep
+        repainting it every so often.
     */
-    virtual void drawScrollbarButton (Graphics& g,
-                                      ScrollBar& scrollbar,
-                                      int width, int height,
-                                      int buttonDirection,
-                                      bool isScrollbarVertical,
-                                      bool isMouseOverButton,
-                                      bool isButtonDown);
-
-    /** Draws the thumb area of a scrollbar.
-
-        @param g                    the context to draw into
-        @param scrollbar            the bar itself
-        @param x                    the x position of the left edge of the thumb area to draw in
-        @param y                    the y position of the top edge of the thumb area to draw in
-        @param width                the width of the thumb area to draw in
-        @param height               the height of the thumb area to draw in
-        @param isScrollbarVertical  true if it's a vertical bar, false if horizontal
-        @param thumbStartPosition   for vertical bars, the y coordinate of the top of the
-                                    thumb, or its x position for horizontal bars
-        @param thumbSize            for vertical bars, the height of the thumb, or its width for
-                                    horizontal bars. This may be 0 if the thumb shouldn't be drawn.
-        @param isMouseOver          whether the mouse is over the thumb area, also true if the mouse is
-                                    currently dragging the thumb
-        @param isMouseDown          whether the mouse is currently dragging the scrollbar
-    */
-    virtual void drawScrollbar (Graphics& g,
-                                ScrollBar& scrollbar,
-                                int x, int y,
-                                int width, int height,
-                                bool isScrollbarVertical,
-                                int thumbStartPosition,
-                                int thumbSize,
-                                bool isMouseOver,
-                                bool isMouseDown);
-
-    /** Returns the component effect to use for a scrollbar */
-    virtual ImageEffectFilter* getScrollbarEffect();
-
-    /** Returns the minimum length in pixels to use for a scrollbar thumb. */
-    virtual int getMinimumScrollbarThumbSize (ScrollBar& scrollbar);
-
-    /** Returns the default thickness to use for a scrollbar. */
-    virtual int getDefaultScrollbarWidth();
-
-    /** Returns the length in pixels to use for a scrollbar button. */
-    virtual int getScrollbarButtonSize (ScrollBar& scrollbar);
+    virtual void drawSpinningWaitAnimation (Graphics&, const Colour& colour,
+                                            int x, int y, int w, int h) = 0;
 
     //==============================================================================
     /** Returns a tick shape for use in yes/no boxes, etc. */
-    virtual Path getTickShape (float height);
+    virtual Path getTickShape (float height) = 0;
     /** Returns a cross shape for use in yes/no boxes, etc. */
-    virtual Path getCrossShape (float height);
-
-    //==============================================================================
-    /** Draws the + or - box in a treeview. */
-    virtual void drawTreeviewPlusMinusBox (Graphics&, const Rectangle<float>& area,
-                                           Colour backgroundColour, bool isOpen, bool isMouseOver);
+    virtual Path getCrossShape (float height) = 0;
 
     //==============================================================================
-    virtual void fillTextEditorBackground (Graphics&, int width, int height, TextEditor& textEditor);
-    virtual void drawTextEditorOutline (Graphics&, int width, int height, TextEditor& textEditor);
-
-    virtual CaretComponent* createCaretComponent (Component* keyFocusOwner);
-
-    //==============================================================================
-    // These return a pointer to an internally cached drawable - make sure you don't keep
-    // a copy of this pointer anywhere, as it may become invalid in the future.
-    virtual const Drawable* getDefaultFolderImage();
-    virtual const Drawable* getDefaultDocumentFileImage();
-
-    virtual AttributedString createFileChooserHeaderText (const String& title,
-                                                          const String& instructions);
-
-    virtual void drawFileBrowserRow (Graphics&, int width, int height,
-                                     const String& filename, Image* icon,
-                                     const String& fileSizeDescription,
-                                     const String& fileTimeDescription,
-                                     bool isDirectory,
-                                     bool isItemSelected,
-                                     int itemIndex,
-                                     DirectoryContentsDisplayComponent& component);
-
-    virtual Button* createFileBrowserGoUpButton();
-
-    virtual void layoutFileBrowserComponent (FileBrowserComponent& browserComp,
-                                             DirectoryContentsDisplayComponent* fileListComponent,
-                                             FilePreviewComponent* previewComp,
-                                             ComboBox* currentPathBox,
-                                             TextEditor* filenameBox,
-                                             Button* goUpButton);
-
-    //==============================================================================
-    virtual void drawBubble (Graphics&, BubbleComponent&,
-                             const Point<float>& tip, const Rectangle<float>& body);
-
-    //==============================================================================
-    virtual void drawLasso (Graphics&, Component& lassoComp);
-
-    //==============================================================================
-    /** Fills the background of a popup menu component. */
-    virtual void drawPopupMenuBackground (Graphics&, int width, int height);
-
-    /** Draws one of the items in a popup menu. */
-    virtual void drawPopupMenuItem (Graphics&,
-                                    int width, int height,
-                                    bool isSeparator,
-                                    bool isActive,
-                                    bool isHighlighted,
-                                    bool isTicked,
-                                    bool hasSubMenu,
-                                    const String& text,
-                                    const String& shortcutKeyText,
-                                    Image* image,
-                                    const Colour* const textColour);
-
-    /** Returns the size and style of font to use in popup menus. */
-    virtual Font getPopupMenuFont();
-
-    virtual void drawPopupMenuUpDownArrow (Graphics&,
-                                           int width, int height,
-                                           bool isScrollUpArrow);
-
-    /** Finds the best size for an item in a popup menu. */
-    virtual void getIdealPopupMenuItemSize (const String& text,
-                                            bool isSeparator,
-                                            int standardMenuItemHeight,
-                                            int& idealWidth,
-                                            int& idealHeight);
-
-    virtual int getMenuWindowFlags();
-
-    virtual void drawMenuBarBackground (Graphics&, int width, int height,
-                                        bool isMouseOverBar,
-                                        MenuBarComponent& menuBar);
-
-    virtual int getMenuBarItemWidth (MenuBarComponent& menuBar, int itemIndex, const String& itemText);
-
-    virtual Font getMenuBarFont (MenuBarComponent& menuBar, int itemIndex, const String& itemText);
-
-    virtual void drawMenuBarItem (Graphics&,
-                                  int width, int height,
-                                  int itemIndex,
-                                  const String& itemText,
-                                  bool isMouseOverItem,
-                                  bool isMenuOpen,
-                                  bool isMouseOverBar,
-                                  MenuBarComponent& menuBar);
-
-    //==============================================================================
-    virtual void drawComboBox (Graphics&, int width, int height,
-                               bool isButtonDown,
-                               int buttonX, int buttonY,
-                               int buttonW, int buttonH,
-                               ComboBox& box);
-
-    virtual Font getComboBoxFont (ComboBox& box);
-
-    virtual Label* createComboBoxTextBox (ComboBox& box);
-
-    virtual void positionComboBoxText (ComboBox& box, Label& labelToPosition);
+    virtual DropShadower* createDropShadowerForComponent (Component*) = 0;
 
     //==============================================================================
-    virtual void drawLabel (Graphics&, Label&);
-
-    virtual Font getLabelFont (Label&);
-
-    //==============================================================================
-    virtual void drawLinearSlider (Graphics&,
-                                   int x, int y,
-                                   int width, int height,
-                                   float sliderPos,
-                                   float minSliderPos,
-                                   float maxSliderPos,
-                                   const Slider::SliderStyle style,
-                                   Slider& slider);
-
-    virtual void drawLinearSliderBackground (Graphics&,
-                                             int x, int y,
-                                             int width, int height,
-                                             float sliderPos,
-                                             float minSliderPos,
-                                             float maxSliderPos,
-                                             const Slider::SliderStyle style,
-                                             Slider& slider);
-
-    virtual void drawLinearSliderThumb (Graphics&,
-                                        int x, int y,
-                                        int width, int height,
-                                        float sliderPos,
-                                        float minSliderPos,
-                                        float maxSliderPos,
-                                        const Slider::SliderStyle style,
-                                        Slider& slider);
-
-    virtual int getSliderThumbRadius (Slider& slider);
-
-    virtual void drawRotarySlider (Graphics&,
-                                   int x, int y,
-                                   int width, int height,
-                                   float sliderPosProportional,
-                                   float rotaryStartAngle,
-                                   float rotaryEndAngle,
-                                   Slider& slider);
-
-    virtual Button* createSliderButton (bool isIncrement);
-    virtual Label* createSliderTextBox (Slider& slider);
-
-    virtual ImageEffectFilter* getSliderEffect();
-
-    virtual Font getSliderPopupFont();
-    virtual int getSliderPopupPlacement();
-
-    //==============================================================================
-    virtual void getTooltipSize (const String& tipText, int& width, int& height);
-
-    virtual void drawTooltip (Graphics&, const String& text, int width, int height);
-
-    //==============================================================================
-    virtual Button* createFilenameComponentBrowseButton (const String& text);
-
-    virtual void layoutFilenameComponent (FilenameComponent& filenameComp,
-                                          ComboBox* filenameBox, Button* browseButton);
-
-    //==============================================================================
-    virtual void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>& area,
-                                            bool isMouseOver, bool isMouseDown,
-                                            ConcertinaPanel&, Component& panel);
-
-    //==============================================================================
-    virtual void drawCornerResizer (Graphics&,
-                                    int w, int h,
-                                    bool isMouseOver,
-                                    bool isMouseDragging);
-
-    virtual void drawResizableFrame (Graphics&,
-                                    int w, int h,
-                                    const BorderSize<int>&);
-
-    //==============================================================================
-    virtual void fillResizableWindowBackground (Graphics&, int w, int h,
-                                                const BorderSize<int>&,
-                                                ResizableWindow& window);
-
-    virtual void drawResizableWindowBorder (Graphics&,
-                                            int w, int h,
-                                            const BorderSize<int>& border,
-                                            ResizableWindow& window);
-
-    //==============================================================================
-    virtual void drawDocumentWindowTitleBar (DocumentWindow& window,
-                                             Graphics&, int w, int h,
-                                             int titleSpaceX, int titleSpaceW,
-                                             const Image* icon,
-                                             bool drawTitleTextOnLeft);
-
-    virtual Button* createDocumentWindowButton (int buttonType);
-
-    virtual void positionDocumentWindowButtons (DocumentWindow& window,
-                                                int titleBarX, int titleBarY,
-                                                int titleBarW, int titleBarH,
-                                                Button* minimiseButton,
-                                                Button* maximiseButton,
-                                                Button* closeButton,
-                                                bool positionTitleBarButtonsOnLeft);
-
-    virtual int getDefaultMenuBarHeight();
-
-    //==============================================================================
-    virtual DropShadower* createDropShadowerForComponent (Component* component);
-
-    //==============================================================================
-    virtual void drawStretchableLayoutResizerBar (Graphics&,
-                                                  int w, int h,
-                                                  bool isVerticalBar,
-                                                  bool isMouseOver,
-                                                  bool isMouseDragging);
-
-    //==============================================================================
-    virtual void drawGroupComponentOutline (Graphics&, int w, int h,
-                                            const String& text,
-                                            const Justification& position,
-                                            GroupComponent& group);
-
-    //==============================================================================
-    virtual int getTabButtonSpaceAroundImage();
-    virtual int getTabButtonOverlap (int tabDepth);
-    virtual int getTabButtonBestWidth (TabBarButton&, int tabDepth);
-    virtual Rectangle<int> getTabButtonExtraComponentBounds (const TabBarButton&, Rectangle<int>& textArea, Component& extraComp);
-
-    virtual void drawTabButton (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown);
-    virtual void drawTabButtonText (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown);
-    virtual void drawTabbedButtonBarBackground (TabbedButtonBar&, Graphics&);
-    virtual void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int w, int h);
-
-    virtual void createTabButtonShape (TabBarButton&, Path& path,  bool isMouseOver, bool isMouseDown);
-    virtual void fillTabButtonShape (TabBarButton&, Graphics&, const Path& path, bool isMouseOver, bool isMouseDown);
-
-    virtual Button* createTabBarExtrasButton();
-
-    //==============================================================================
-    virtual void drawImageButton (Graphics&, Image* image,
-                                  int imageX, int imageY, int imageW, int imageH,
-                                  const Colour& overlayColour,
-                                  float imageOpacity,
-                                  ImageButton& button);
-
-    //==============================================================================
-    virtual void drawTableHeaderBackground (Graphics&, TableHeaderComponent&);
-
-    virtual void drawTableHeaderColumn (Graphics&, const String& columnName, int columnId,
-                                        int width, int height,
-                                        bool isMouseOver, bool isMouseDown,
-                                        int columnFlags);
-
-    //==============================================================================
-    virtual void paintToolbarBackground (Graphics&, int width, int height, Toolbar& toolbar);
-
-    virtual Button* createToolbarMissingItemsButton (Toolbar& toolbar);
-
-    virtual void paintToolbarButtonBackground (Graphics&, int width, int height,
-                                               bool isMouseOver, bool isMouseDown,
-                                               ToolbarItemComponent& component);
-
-    virtual void paintToolbarButtonLabel (Graphics&, int x, int y, int width, int height,
-                                          const String& text, ToolbarItemComponent& component);
-
-    //==============================================================================
-    virtual void drawPropertyPanelSectionHeader (Graphics&, const String& name,
-                                                 bool isOpen, int width, int height);
-
-    virtual void drawPropertyComponentBackground (Graphics&, int width, int height,
-                                                  PropertyComponent& component);
-
-    virtual void drawPropertyComponentLabel (Graphics&, int width, int height,
-                                             PropertyComponent& component);
-
-    virtual Rectangle<int> getPropertyComponentContentPosition (PropertyComponent& component);
-
-    //==============================================================================
-    virtual void drawCallOutBoxBackground (CallOutBox& box, Graphics&, const Path& path, Image& cachedImage);
-
-    //==============================================================================
-    virtual void drawLevelMeter (Graphics&, int width, int height, float level);
-
-    virtual void drawKeymapChangeButton (Graphics&, int width, int height, Button& button, const String& keyDescription);
-
-    //==============================================================================
-    /** Plays the system's default 'beep' noise, to alert the user about something very important.
-    */
+    /** Plays the system's default 'beep' noise, to alert the user about something very important. */
     virtual void playAlertSound();
 
-    //==============================================================================
-    /** Draws a 3D raised (or indented) bevel using two colours.
-
-        The bevel is drawn inside the given rectangle, and greater bevel thicknesses
-        extend inwards.
-
-        The top-left colour is used for the top- and left-hand edges of the
-        bevel; the bottom-right colour is used for the bottom- and right-hand
-        edges.
-
-        If useGradient is true, then the bevel fades out to make it look more curved
-        and less angular. If sharpEdgeOnOutside is true, the outside of the bevel is
-        sharp, and it fades towards the centre; if sharpEdgeOnOutside is false, then
-        the centre edges are sharp and it fades towards the outside.
-    */
-    static void drawBevel (Graphics&,
-                            int x, int y, int width, int height,
-                            int bevelThickness,
-                            const Colour& topLeftColour = Colours::white,
-                            const Colour& bottomRightColour = Colours::black,
-                            bool useGradient = true,
-                            bool sharpEdgeOnOutside = true);
-
-    /** Utility function to draw a shiny, glassy circle (for round LED-type buttons). */
-    static void drawGlassSphere (Graphics&,
-                                 float x, float y,
-                                 float diameter,
-                                 const Colour& colour,
-                                 float outlineThickness) noexcept;
-
-    static void drawGlassPointer (Graphics&,
-                                  float x, float y,
-                                  float diameter,
-                                  const Colour& colour, float outlineThickness,
-                                  int direction) noexcept;
-
-    /** Utility function to draw a shiny, glassy oblong (for text buttons). */
-    static void drawGlassLozenge (Graphics&,
-                                  float x, float y,
-                                  float width, float height,
-                                  const Colour& colour,
-                                  float outlineThickness,
-                                  float cornerSize,
-                                  bool flatOnLeft, bool flatOnRight,
-                                  bool flatOnTop, bool flatOnBottom) noexcept;
-
-    static Drawable* loadDrawableFromData (const void* data, size_t numBytes);
-
 private:
     //==============================================================================
     friend class WeakReference<LookAndFeel>;
@@ -629,41 +223,9 @@ private:
     };
 
     SortedSet<ColourSetting> colours;
-
-    // default typeface names
     String defaultSans, defaultSerif, defaultFixed;
-
-    ScopedPointer<Drawable> folderImage, documentImage;
-
     bool useNativeAlertWindows;
 
-    void drawShinyButtonShape (Graphics&,
-                               float x, float y, float w, float h, float maxCornerSize,
-                               const Colour& baseColour,
-                               float strokeWidth,
-                               bool flatOnLeft,
-                               bool flatOnRight,
-                               bool flatOnTop,
-                               bool flatOnBottom) noexcept;
-
-   #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
-    // These methods have been deprecated - see their new parameter lists..
-    virtual int drawFileBrowserRow (Graphics&, int, int, const String&, Image*, const String&, const String&, bool, bool, int) { return 0; }
-    virtual int drawTabButton (Graphics&, int, int, const Colour&, int, const String&, Button&, TabbedButtonBar::Orientation, bool, bool, bool) { return 0; }
-    virtual int createTabButtonShape (Path&, int, int, int, const String&, Button&, TabbedButtonBar::Orientation, bool, bool, bool) { return 0; }
-    virtual int fillTabButtonShape (Graphics&, const Path&, const Colour&, int, const String&, Button&, TabbedButtonBar::Orientation, bool, bool, bool) { return 0; }
-    virtual int drawTabAreaBehindFrontButton (Graphics&, int, int, TabbedButtonBar&, TabbedButtonBar::Orientation) { return 0; }
-    virtual int drawTabButtonText (Graphics&, int, int, int, int, const Colour&, int, const String&, Button&, TabbedButtonBar::Orientation, bool, bool, bool) { return 0; }
-    virtual int getTabButtonBestWidth (int, const String&, int, Button&) { return 0; }
-    virtual int drawBubble (Graphics&, float, float, float, float, float, float) { return 0; }
-    virtual int getFontForTextButton (TextButton&) { return 0; }
-    virtual int createFileChooserHeaderText (const String&, const String&, GlyphArrangement&, int) { return 0; }
-    virtual int drawTreeviewPlusMinusBox (Graphics&, int, int, int, int, bool, bool) { return 0; }
-   #endif
-
-    class GlassWindowButton;
-    class SliderLabelComp;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LookAndFeel)
 };
 

modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.cpp → modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-OldSchoolLookAndFeel::OldSchoolLookAndFeel()
+LookAndFeel_V1::LookAndFeel_V1()
 {
     setColour (TextButton::buttonColourId,          Colour (0xffbbbbff));
     setColour (ListBox::outlineColourId,            findColour (ComboBox::outlineColourId));
@@ -41,16 +41,13 @@ OldSchoolLookAndFeel::OldSchoolLookAndFeel()
     scrollbarShadow.setShadowProperties (DropShadow (Colours::black.withAlpha (0.5f), 2, Point<int>()));
 }
 
-OldSchoolLookAndFeel::~OldSchoolLookAndFeel()
+LookAndFeel_V1::~LookAndFeel_V1()
 {
 }
 
 //==============================================================================
-void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g,
-                                                 Button& button,
-                                                 const Colour& backgroundColour,
-                                                 bool isMouseOverButton,
-                                                 bool isButtonDown)
+void LookAndFeel_V1::drawButtonBackground (Graphics& g, Button& button, const Colour& backgroundColour,
+                                           bool isMouseOverButton, bool isButtonDown)
 {
     const int width = button.getWidth();
     const int height = button.getHeight();
@@ -84,13 +81,12 @@ void OldSchoolLookAndFeel::drawButtonBackground (Graphics& g,
     g.strokePath (p, PathStrokeType ((isMouseOverButton) ? 2.0f : 1.4f));
 }
 
-void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
-                                        Component& /*component*/,
-                                        float x, float y, float w, float h,
-                                        const bool ticked,
-                                        const bool isEnabled,
-                                        const bool /*isMouseOverButton*/,
-                                        const bool isButtonDown)
+void LookAndFeel_V1::drawTickBox (Graphics& g, Component& /*component*/,
+                                  float x, float y, float w, float h,
+                                  const bool ticked,
+                                  const bool isEnabled,
+                                  const bool /*isMouseOverButton*/,
+                                  const bool isButtonDown)
 {
     Path box;
     box.addRoundedRectangle (0.0f, 2.0f, 6.0f, 6.0f, 1.0f);
@@ -117,10 +113,7 @@ void OldSchoolLookAndFeel::drawTickBox (Graphics& g,
     }
 }
 
-void OldSchoolLookAndFeel::drawToggleButton (Graphics& g,
-                                             ToggleButton& button,
-                                             bool isMouseOverButton,
-                                             bool isButtonDown)
+void LookAndFeel_V1::drawToggleButton (Graphics& g, ToggleButton& button, bool isMouseOverButton, bool isButtonDown)
 {
     if (button.hasKeyboardFocus (true))
     {
@@ -151,13 +144,13 @@ void OldSchoolLookAndFeel::drawToggleButton (Graphics& g,
                       Justification::centredLeft, 10);
 }
 
-void OldSchoolLookAndFeel::drawProgressBar (Graphics& g, ProgressBar& progressBar,
-                                            int width, int height,
-                                            double progress, const String& textToShow)
+void LookAndFeel_V1::drawProgressBar (Graphics& g, ProgressBar& progressBar,
+                                      int width, int height,
+                                      double progress, const String& textToShow)
 {
     if (progress < 0 || progress >= 1.0)
     {
-        LookAndFeel::drawProgressBar (g, progressBar, width, height, progress, textToShow);
+        LookAndFeel_V2::drawProgressBar (g, progressBar, width, height, progress, textToShow);
     }
     else
     {
@@ -181,13 +174,11 @@ void OldSchoolLookAndFeel::drawProgressBar (Graphics& g, ProgressBar& progressBa
     }
 }
 
-void OldSchoolLookAndFeel::drawScrollbarButton (Graphics& g,
-                                                ScrollBar& bar,
-                                                int width, int height,
-                                                int buttonDirection,
-                                                bool isScrollbarVertical,
-                                                bool isMouseOverButton,
-                                                bool isButtonDown)
+void LookAndFeel_V1::drawScrollbarButton (Graphics& g, ScrollBar& bar,
+                                          int width, int height, int buttonDirection,
+                                          bool isScrollbarVertical,
+                                          bool isMouseOverButton,
+                                          bool isButtonDown)
 {
     if (isScrollbarVertical)
         width -= 2;
@@ -226,15 +217,10 @@ void OldSchoolLookAndFeel::drawScrollbarButton (Graphics& g,
     g.strokePath (p, PathStrokeType (0.5f));
 }
 
-void OldSchoolLookAndFeel::drawScrollbar (Graphics& g,
-                                          ScrollBar& bar,
-                                          int x, int y,
-                                          int width, int height,
-                                          bool isScrollbarVertical,
-                                          int thumbStartPosition,
-                                          int thumbSize,
-                                          bool isMouseOver,
-                                          bool isMouseDown)
+void LookAndFeel_V1::drawScrollbar (Graphics& g, ScrollBar& bar,
+                                    int x, int y, int width, int height,
+                                    bool isScrollbarVertical, int thumbStartPosition, int thumbSize,
+                                    bool isMouseOver, bool isMouseDown)
 {
     g.fillAll (bar.findColour (ScrollBar::backgroundColourId));
 
@@ -296,14 +282,14 @@ void OldSchoolLookAndFeel::drawScrollbar (Graphics& g,
     }
 }
 
-ImageEffectFilter* OldSchoolLookAndFeel::getScrollbarEffect()
+ImageEffectFilter* LookAndFeel_V1::getScrollbarEffect()
 {
     return &scrollbarShadow;
 }
 
 
 //==============================================================================
-void OldSchoolLookAndFeel::drawPopupMenuBackground (Graphics& g, int width, int height)
+void LookAndFeel_V1::drawPopupMenuBackground (Graphics& g, int width, int height)
 {
     g.fillAll (findColour (PopupMenu::backgroundColourId));
 
@@ -311,15 +297,14 @@ void OldSchoolLookAndFeel::drawPopupMenuBackground (Graphics& g, int width, int
     g.drawRect (0, 0, width, height);
 }
 
-void OldSchoolLookAndFeel::drawMenuBarBackground (Graphics& g, int /*width*/, int /*height*/,
-                                                  bool, MenuBarComponent& menuBar)
+void LookAndFeel_V1::drawMenuBarBackground (Graphics& g, int /*width*/, int /*height*/, bool, MenuBarComponent& menuBar)
 {
     g.fillAll (menuBar.findColour (PopupMenu::backgroundColourId));
 }
 
 
 //==============================================================================
-void OldSchoolLookAndFeel::drawTextEditorOutline (Graphics& g, int width, int height, TextEditor& textEditor)
+void LookAndFeel_V1::drawTextEditorOutline (Graphics& g, int width, int height, TextEditor& textEditor)
 {
     if (textEditor.isEnabled())
     {
@@ -329,11 +314,10 @@ void OldSchoolLookAndFeel::drawTextEditorOutline (Graphics& g, int width, int he
 }
 
 //==============================================================================
-void OldSchoolLookAndFeel::drawComboBox (Graphics& g, int width, int height,
-                                         const bool isButtonDown,
-                                         int buttonX, int buttonY,
-                                         int buttonW, int buttonH,
-                                         ComboBox& box)
+void LookAndFeel_V1::drawComboBox (Graphics& g, int width, int height,
+                                   const bool isButtonDown,
+                                   int buttonX, int buttonY, int buttonW, int buttonH,
+                                   ComboBox& box)
 {
     g.fillAll (box.findColour (ComboBox::backgroundColourId));
 
@@ -364,7 +348,7 @@ void OldSchoolLookAndFeel::drawComboBox (Graphics& g, int width, int height,
     }
 }
 
-Font OldSchoolLookAndFeel::getComboBoxFont (ComboBox& box)
+Font LookAndFeel_V1::getComboBoxFont (ComboBox& box)
 {
     Font f (jmin (15.0f, box.getHeight() * 0.85f));
     f.setHorizontalScale (0.9f);
@@ -383,14 +367,11 @@ static void drawTriangle (Graphics& g, float x1, float y1, float x2, float y2, f
     g.strokePath (p, PathStrokeType (0.3f));
 }
 
-void OldSchoolLookAndFeel::drawLinearSlider (Graphics& g,
-                                             int x, int y,
-                                             int w, int h,
-                                             float sliderPos,
-                                             float minSliderPos,
-                                             float maxSliderPos,
-                                             const Slider::SliderStyle style,
-                                             Slider& slider)
+void LookAndFeel_V1::drawLinearSlider (Graphics& g,
+                                       int x, int y, int w, int h,
+                                       float sliderPos, float minSliderPos, float maxSliderPos,
+                                       const Slider::SliderStyle style,
+                                       Slider& slider)
 {
     g.fillAll (slider.findColour (Slider::backgroundColourId));
 
@@ -468,7 +449,7 @@ void OldSchoolLookAndFeel::drawLinearSlider (Graphics& g,
     }
 }
 
-Button* OldSchoolLookAndFeel::createSliderButton (const bool isIncrement)
+Button* LookAndFeel_V1::createSliderButton (const bool isIncrement)
 {
     if (isIncrement)
         return new ArrowButton ("u", 0.75f, Colours::white.withAlpha (0.8f));
@@ -476,21 +457,18 @@ Button* OldSchoolLookAndFeel::createSliderButton (const bool isIncrement)
         return new ArrowButton ("d", 0.25f, Colours::white.withAlpha (0.8f));
 }
 
-ImageEffectFilter* OldSchoolLookAndFeel::getSliderEffect()
+ImageEffectFilter* LookAndFeel_V1::getSliderEffect()
 {
     return &scrollbarShadow;
 }
 
-int OldSchoolLookAndFeel::getSliderThumbRadius (Slider&)
+int LookAndFeel_V1::getSliderThumbRadius (Slider&)
 {
     return 8;
 }
 
 //==============================================================================
-void OldSchoolLookAndFeel::drawCornerResizer (Graphics& g,
-                                              int w, int h,
-                                              bool isMouseOver,
-                                              bool isMouseDragging)
+void LookAndFeel_V1::drawCornerResizer (Graphics& g, int w, int h, bool isMouseOver, bool isMouseDragging)
 {
     g.setColour ((isMouseOver || isMouseDragging) ? Colours::lightgrey
                                                   : Colours::darkgrey);
@@ -508,7 +486,7 @@ void OldSchoolLookAndFeel::drawCornerResizer (Graphics& g,
 }
 
 //==============================================================================
-Button* OldSchoolLookAndFeel::createDocumentWindowButton (int buttonType)
+Button* LookAndFeel_V1::createDocumentWindowButton (int buttonType)
 {
     Path shape;
 
@@ -553,15 +531,12 @@ Button* OldSchoolLookAndFeel::createDocumentWindowButton (int buttonType)
     return nullptr;
 }
 
-void OldSchoolLookAndFeel::positionDocumentWindowButtons (DocumentWindow&,
-                                                          int titleBarX,
-                                                          int titleBarY,
-                                                          int titleBarW,
-                                                          int titleBarH,
-                                                          Button* minimiseButton,
-                                                          Button* maximiseButton,
-                                                          Button* closeButton,
-                                                          bool positionTitleBarButtonsOnLeft)
+void LookAndFeel_V1::positionDocumentWindowButtons (DocumentWindow&,
+                                                    int titleBarX, int titleBarY, int titleBarW, int titleBarH,
+                                                    Button* minimiseButton,
+                                                    Button* maximiseButton,
+                                                    Button* closeButton,
+                                                    bool positionTitleBarButtonsOnLeft)
 {
     titleBarY += titleBarH / 8;
     titleBarH -= titleBarH / 4;

modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h

@@ -0,0 +1,101 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission is granted to use this software under the terms of either:
+   a) the GPL v2 (or any later version)
+   b) the Affero GPL v3
+
+   Details of these licenses can be found at: www.gnu.org/licenses
+
+   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   ------------------------------------------------------------------------------
+
+   To release a closed-source product which uses JUCE, commercial licenses are
+   available: visit www.juce.com for more information.
+
+  ==============================================================================
+*/
+
+#ifndef JUCE_LOOKANDFEEL_V1_H_INCLUDED
+#define JUCE_LOOKANDFEEL_V1_H_INCLUDED
+
+//==============================================================================
+/**
+    The original JUCE look-and-feel, as used back from 2002 to about 2007ish.
+    @see LookAndFeel, LookAndFeel_V2, LookAndFeel_V3
+*/
+class JUCE_API  LookAndFeel_V1    : public LookAndFeel_V2
+{
+public:
+    LookAndFeel_V1();
+    ~LookAndFeel_V1();
+
+    //==============================================================================
+    void drawButtonBackground (Graphics&, Button&, const Colour& backgroundColour,
+                               bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawToggleButton (Graphics&, ToggleButton&, bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawTickBox (Graphics&, Component&, float x, float y, float w, float h,
+                      bool ticked, bool isEnabled, bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawProgressBar (Graphics&, ProgressBar&, int width, int height,
+                          double progress, const String& textToShow) override;
+
+    //==============================================================================
+    void drawScrollbarButton (Graphics&, ScrollBar&, int width, int height,
+                              int buttonDirection, bool isScrollbarVertical,
+                              bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawScrollbar (Graphics&, ScrollBar&, int x, int y, int width, int height,
+                        bool isScrollbarVertical, int thumbStartPosition, int thumbSize,
+                        bool isMouseOver, bool isMouseDown) override;
+
+    ImageEffectFilter* getScrollbarEffect() override;
+
+    //==============================================================================
+    void drawTextEditorOutline (Graphics&, int width, int height, TextEditor&) override;
+
+    //==============================================================================
+    void drawPopupMenuBackground (Graphics&, int width, int height) override;
+    void drawMenuBarBackground (Graphics&, int width, int height, bool isMouseOverBar, MenuBarComponent&) override;
+
+    //==============================================================================
+    void drawComboBox (Graphics&, int width, int height, bool isButtonDown,
+                       int buttonX, int buttonY, int buttonW, int buttonH, ComboBox&) override;
+
+    Font getComboBoxFont (ComboBox&) override;
+
+    //==============================================================================
+    void drawLinearSlider (Graphics&, int x, int y, int width, int height,
+                           float sliderPos, float minSliderPos, float maxSliderPos,
+                           const Slider::SliderStyle, Slider&) override;
+
+    int getSliderThumbRadius (Slider&) override;
+    Button* createSliderButton (bool isIncrement) override;
+    ImageEffectFilter* getSliderEffect() override;
+
+    //==============================================================================
+    void drawCornerResizer (Graphics&, int w, int h, bool isMouseOver, bool isMouseDragging) override;
+
+    Button* createDocumentWindowButton (int buttonType) override;
+
+    void positionDocumentWindowButtons (DocumentWindow&,
+                                        int titleBarX, int titleBarY, int titleBarW, int titleBarH,
+                                        Button* minimiseButton, Button* maximiseButton, Button* closeButton,
+                                        bool positionTitleBarButtonsOnLeft) override;
+
+private:
+    DropShadowEffect scrollbarShadow;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LookAndFeel_V1)
+};
+
+
+#endif   // JUCE_LOOKANDFEEL_H_INCLUDED

modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h

@@ -0,0 +1,347 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission is granted to use this software under the terms of either:
+   a) the GPL v2 (or any later version)
+   b) the Affero GPL v3
+
+   Details of these licenses can be found at: www.gnu.org/licenses
+
+   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   ------------------------------------------------------------------------------
+
+   To release a closed-source product which uses JUCE, commercial licenses are
+   available: visit www.juce.com for more information.
+
+  ==============================================================================
+*/
+
+#ifndef JUCE_LOOKANDFEEL_V2_H_INCLUDED
+#define JUCE_LOOKANDFEEL_V2_H_INCLUDED
+
+
+//==============================================================================
+/**
+    This LookAndFeel subclass implements the juce style from around 2008-12.
+
+    @see LookAndFeel, LookAndFeel_V1, LookAndFeel_V3
+*/
+class JUCE_API  LookAndFeel_V2  : public LookAndFeel
+{
+public:
+    LookAndFeel_V2();
+    ~LookAndFeel_V2();
+
+    //==============================================================================
+    void drawButtonBackground (Graphics&, Button& button, const Colour& backgroundColour,
+                               bool isMouseOverButton, bool isButtonDown) override;
+
+    Font getTextButtonFont (TextButton&) override;
+
+    void drawButtonText (Graphics&, TextButton& button,
+                         bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawToggleButton (Graphics&, ToggleButton& button, bool isMouseOverButton, bool isButtonDown) override;
+
+    void changeToggleButtonWidthToFitText (ToggleButton&) override;
+
+    void drawTickBox (Graphics&, Component&,
+                      float x, float y, float w, float h,
+                      bool ticked, bool isEnabled, bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawDrawableButton (Graphics&, DrawableButton&, bool isMouseOverButton, bool isButtonDown) override;
+
+    //==============================================================================
+    AlertWindow* createAlertWindow (const String& title, const String& message,
+                                    const String& button1,
+                                    const String& button2,
+                                    const String& button3,
+                                    AlertWindow::AlertIconType iconType,
+                                    int numButtons, Component* associatedComponent) override;
+
+    void drawAlertBox (Graphics&, AlertWindow&, const Rectangle<int>& textArea, TextLayout&) override;
+    int getAlertBoxWindowFlags() override;
+    int getAlertWindowButtonHeight() override;
+    Font getAlertWindowMessageFont() override;
+    Font getAlertWindowFont() override;
+
+    //==============================================================================
+    void drawProgressBar (Graphics&, ProgressBar&, int width, int height, double progress, const String& textToShow) override;
+    void drawSpinningWaitAnimation (Graphics&, const Colour& colour, int x, int y, int w, int h) override;
+
+    //==============================================================================
+    bool areScrollbarButtonsVisible() override;
+    void drawScrollbarButton (Graphics& g, ScrollBar&, int width, int height, int buttonDirection,
+                              bool isScrollbarVertical, bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawScrollbar (Graphics& g, ScrollBar&, int x, int y, int width, int height,
+                        bool isScrollbarVertical, int thumbStartPosition, int thumbSize,
+                        bool isMouseOver, bool isMouseDown) override;
+
+    ImageEffectFilter* getScrollbarEffect() override;
+    int getMinimumScrollbarThumbSize (ScrollBar&) override;
+    int getDefaultScrollbarWidth() override;
+    int getScrollbarButtonSize (ScrollBar& scrollbar) override;
+
+    //==============================================================================
+    Path getTickShape (float height) override;
+    Path getCrossShape (float height) override;
+
+    //==============================================================================
+    void drawTreeviewPlusMinusBox (Graphics&, const Rectangle<float>& area,
+                                   Colour backgroundColour, bool isOpen, bool isMouseOver) override;
+    bool areLinesDrawnForTreeView (TreeView&) override;
+    int getTreeViewIndentSize (TreeView&) override;
+
+    //==============================================================================
+    void fillTextEditorBackground (Graphics&, int width, int height, TextEditor&) override;
+    void drawTextEditorOutline (Graphics&, int width, int height, TextEditor&) override;
+    CaretComponent* createCaretComponent (Component* keyFocusOwner) override;
+
+    //==============================================================================
+    const Drawable* getDefaultFolderImage() override;
+    const Drawable* getDefaultDocumentFileImage() override;
+
+    AttributedString createFileChooserHeaderText (const String& title, const String& instructions) override;
+
+    void drawFileBrowserRow (Graphics&, int width, int height,
+                             const String& filename, Image* icon,
+                             const String& fileSizeDescription, const String& fileTimeDescription,
+                             bool isDirectory, bool isItemSelected, int itemIndex,
+                             DirectoryContentsDisplayComponent&) override;
+
+    Button* createFileBrowserGoUpButton() override;
+
+    void layoutFileBrowserComponent (FileBrowserComponent&,
+                                     DirectoryContentsDisplayComponent*,
+                                     FilePreviewComponent*,
+                                     ComboBox* currentPathBox,
+                                     TextEditor* filenameBox,
+                                     Button* goUpButton) override;
+
+    //==============================================================================
+    void drawBubble (Graphics&, BubbleComponent&, const Point<float>& tip, const Rectangle<float>& body) override;
+
+    void drawLasso (Graphics&, Component&) override;
+
+    //==============================================================================
+    void drawPopupMenuBackground (Graphics&, int width, int height) override;
+
+    void drawPopupMenuItem (Graphics&, int width, int height,
+                            bool isSeparator, bool isActive, bool isHighlighted, bool isTicked, bool hasSubMenu,
+                            const String& text, const String& shortcutKeyText,
+                            Image* image, const Colour* textColour) override;
+
+    Font getPopupMenuFont() override;
+
+    void drawPopupMenuUpDownArrow (Graphics&, int width, int height, bool isScrollUpArrow) override;
+
+    void getIdealPopupMenuItemSize (const String& text, bool isSeparator, int standardMenuItemHeight,
+                                    int& idealWidth, int& idealHeight) override;
+    int getMenuWindowFlags() override;
+
+    void drawMenuBarBackground (Graphics&, int width, int height, bool isMouseOverBar, MenuBarComponent&) override;
+    int getMenuBarItemWidth (MenuBarComponent&, int itemIndex, const String& itemText) override;
+    Font getMenuBarFont (MenuBarComponent&, int itemIndex, const String& itemText) override;
+    int getDefaultMenuBarHeight() override;
+
+    void drawMenuBarItem (Graphics&, int width, int height,
+                          int itemIndex, const String& itemText,
+                          bool isMouseOverItem, bool isMenuOpen, bool isMouseOverBar,
+                          MenuBarComponent&) override;
+
+    //==============================================================================
+    void drawComboBox (Graphics&, int width, int height, bool isButtonDown,
+                       int buttonX, int buttonY, int buttonW, int buttonH,
+                       ComboBox&) override;
+    Font getComboBoxFont (ComboBox&) override;
+    Label* createComboBoxTextBox (ComboBox&) override;
+    void positionComboBoxText (ComboBox&, Label&) override;
+
+    //==============================================================================
+    void drawLabel (Graphics&, Label&) override;
+    Font getLabelFont (Label&) override;
+
+    //==============================================================================
+    void drawLinearSlider (Graphics&, int x, int y, int width, int height,
+                           float sliderPos, float minSliderPos, float maxSliderPos,
+                           const Slider::SliderStyle, Slider&) override;
+
+    void drawLinearSliderBackground (Graphics&, int x, int y, int width, int height,
+                                     float sliderPos, float minSliderPos, float maxSliderPos,
+                                     const Slider::SliderStyle, Slider&) override;
+
+    void drawLinearSliderThumb (Graphics&, int x, int y, int width, int height,
+                                float sliderPos, float minSliderPos, float maxSliderPos,
+                                const Slider::SliderStyle, Slider&) override;
+
+    void drawRotarySlider (Graphics&, int x, int y, int width, int height,
+                           float sliderPosProportional, float rotaryStartAngle, float rotaryEndAngle,
+                           Slider&) override;
+
+    int getSliderThumbRadius (Slider&) override;
+    Button* createSliderButton (bool isIncrement) override;
+    Label* createSliderTextBox (Slider&) override;
+    ImageEffectFilter* getSliderEffect() override;
+    Font getSliderPopupFont() override;
+    int getSliderPopupPlacement() override;
+
+    //==============================================================================
+    void getTooltipSize (const String& tipText, int& width, int& height) override;
+    void drawTooltip (Graphics&, const String& text, int width, int height) override;
+
+    //==============================================================================
+    Button* createFilenameComponentBrowseButton (const String& text) override;
+    void layoutFilenameComponent (FilenameComponent& filenameComp, ComboBox* filenameBox, Button* browseButton) override;
+
+    //==============================================================================
+    void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>& area,
+                                    bool isMouseOver, bool isMouseDown,
+                                    ConcertinaPanel&, Component& panel) override;
+
+    //==============================================================================
+    void drawCornerResizer (Graphics&, int w, int h, bool isMouseOver, bool isMouseDragging) override;
+    void drawResizableFrame (Graphics&, int w, int h, const BorderSize<int>&) override;
+
+    //==============================================================================
+    void fillResizableWindowBackground (Graphics&, int w, int h, const BorderSize<int>&, ResizableWindow&) override;
+    void drawResizableWindowBorder (Graphics&, int w, int h, const BorderSize<int>& border, ResizableWindow&) override;
+
+    //==============================================================================
+    void drawDocumentWindowTitleBar (DocumentWindow&, Graphics&, int w, int h,
+                                     int titleSpaceX, int titleSpaceW,
+                                     const Image* icon, bool drawTitleTextOnLeft) override;
+
+    Button* createDocumentWindowButton (int buttonType) override;
+
+    void positionDocumentWindowButtons (DocumentWindow&,
+                                        int titleBarX, int titleBarY, int titleBarW, int titleBarH,
+                                        Button* minimiseButton,
+                                        Button* maximiseButton,
+                                        Button* closeButton,
+                                        bool positionTitleBarButtonsOnLeft) override;
+
+    //==============================================================================
+    DropShadower* createDropShadowerForComponent (Component*) override;
+
+    //==============================================================================
+    void drawStretchableLayoutResizerBar (Graphics&, int w, int h, bool isVerticalBar,
+                                          bool isMouseOver, bool isMouseDragging) override;
+
+    //==============================================================================
+    void drawGroupComponentOutline (Graphics&, int w, int h, const String& text,
+                                    const Justification&, GroupComponent&) override;
+
+    //==============================================================================
+    int getTabButtonSpaceAroundImage() override;
+    int getTabButtonOverlap (int tabDepth) override;
+    int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
+    Rectangle<int> getTabButtonExtraComponentBounds (const TabBarButton&, Rectangle<int>& textArea, Component& extraComp) override;
+
+    void drawTabButton (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown) override;
+    void drawTabButtonText (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown) override;
+    void drawTabbedButtonBarBackground (TabbedButtonBar&, Graphics&) override;
+    void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int w, int h) override;
+
+    void createTabButtonShape (TabBarButton&, Path& path,  bool isMouseOver, bool isMouseDown) override;
+    void fillTabButtonShape (TabBarButton&, Graphics&, const Path& path, bool isMouseOver, bool isMouseDown) override;
+
+    Button* createTabBarExtrasButton() override;
+
+    //==============================================================================
+    void drawImageButton (Graphics&, Image*,
+                          int imageX, int imageY, int imageW, int imageH,
+                          const Colour& overlayColour, float imageOpacity, ImageButton&) override;
+
+    //==============================================================================
+    void drawTableHeaderBackground (Graphics&, TableHeaderComponent&) override;
+
+    void drawTableHeaderColumn (Graphics&, const String& columnName, int columnId,
+                                int width, int height, bool isMouseOver, bool isMouseDown,
+                                int columnFlags) override;
+
+    //==============================================================================
+    void paintToolbarBackground (Graphics&, int width, int height, Toolbar&) override;
+
+    Button* createToolbarMissingItemsButton (Toolbar&) override;
+
+    void paintToolbarButtonBackground (Graphics&, int width, int height,
+                                       bool isMouseOver, bool isMouseDown,
+                                       ToolbarItemComponent&) override;
+
+    void paintToolbarButtonLabel (Graphics&, int x, int y, int width, int height,
+                                  const String& text, ToolbarItemComponent&) override;
+
+    //==============================================================================
+    void drawPropertyPanelSectionHeader (Graphics&, const String& name, bool isOpen, int width, int height) override;
+    void drawPropertyComponentBackground (Graphics&, int width, int height, PropertyComponent&) override;
+    void drawPropertyComponentLabel (Graphics&, int width, int height, PropertyComponent&) override;
+    Rectangle<int> getPropertyComponentContentPosition (PropertyComponent&) override;
+
+    //==============================================================================
+    void drawCallOutBoxBackground (CallOutBox&, Graphics&, const Path& path, Image& cachedImage) override;
+
+    //==============================================================================
+    void drawLevelMeter (Graphics&, int width, int height, float level) override;
+
+    void drawKeymapChangeButton (Graphics&, int width, int height, Button& button, const String& keyDescription) override;
+
+    //==============================================================================
+    /** Draws a 3D raised (or indented) bevel using two colours.
+
+        The bevel is drawn inside the given rectangle, and greater bevel thicknesses
+        extend inwards.
+
+        The top-left colour is used for the top- and left-hand edges of the
+        bevel; the bottom-right colour is used for the bottom- and right-hand
+        edges.
+
+        If useGradient is true, then the bevel fades out to make it look more curved
+        and less angular. If sharpEdgeOnOutside is true, the outside of the bevel is
+        sharp, and it fades towards the centre; if sharpEdgeOnOutside is false, then
+        the centre edges are sharp and it fades towards the outside.
+    */
+    static void drawBevel (Graphics&,
+                           int x, int y, int width, int height,
+                           int bevelThickness,
+                           const Colour& topLeftColour = Colours::white,
+                           const Colour& bottomRightColour = Colours::black,
+                           bool useGradient = true,
+                           bool sharpEdgeOnOutside = true);
+
+    /** Utility function to draw a shiny, glassy circle (for round LED-type buttons). */
+    static void drawGlassSphere (Graphics&, float x, float y, float diameter,
+                                 const Colour& colour, float outlineThickness) noexcept;
+
+    static void drawGlassPointer (Graphics&, float x, float y, float diameter,
+                                  const Colour& colour, float outlineThickness, int direction) noexcept;
+
+    /** Utility function to draw a shiny, glassy oblong (for text buttons). */
+    static void drawGlassLozenge (Graphics&,
+                                  float x, float y, float width, float height,
+                                  const Colour& colour, float outlineThickness, float cornerSize,
+                                  bool flatOnLeft, bool flatOnRight, bool flatOnTop, bool flatOnBottom) noexcept;
+
+private:
+    //==============================================================================
+    ScopedPointer<Drawable> folderImage, documentImage;
+
+    void drawShinyButtonShape (Graphics&,
+                               float x, float y, float w, float h, float maxCornerSize,
+                               const Colour& baseColour, float strokeWidth,
+                               bool flatOnLeft, bool flatOnRight, bool flatOnTop, bool flatOnBottom) noexcept;
+
+    class GlassWindowButton;
+    class SliderLabelComp;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LookAndFeel_V2)
+};
+
+
+#endif   // JUCE_LOOKANDFEEL_H_INCLUDED

modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.cpp

@@ -0,0 +1,361 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission is granted to use this software under the terms of either:
+   a) the GPL v2 (or any later version)
+   b) the Affero GPL v3
+
+   Details of these licenses can be found at: www.gnu.org/licenses
+
+   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   ------------------------------------------------------------------------------
+
+   To release a closed-source product which uses JUCE, commercial licenses are
+   available: visit www.juce.com for more information.
+
+  ==============================================================================
+*/
+
+LookAndFeel_V3::LookAndFeel_V3()
+{
+    setColour (TreeView::selectedItemBackgroundColourId, Colour (0x301111ee));
+
+    const Colour textButtonColour (0xffeeeeff);
+    setColour (TextButton::buttonColourId, textButtonColour);
+    setColour (ComboBox::buttonColourId, textButtonColour);
+
+    setColour (ScrollBar::thumbColourId, Colour::greyLevel (0.8f).contrasting().withAlpha (0.13f));
+}
+
+LookAndFeel_V3::~LookAndFeel_V3() {}
+
+bool LookAndFeel_V3::areScrollbarButtonsVisible()        { return false; }
+
+void LookAndFeel_V3::drawStretchableLayoutResizerBar (Graphics& g, int /*w*/, int /*h*/, bool /*isVerticalBar*/,
+                                                      bool isMouseOver, bool isMouseDragging)
+{
+    if (isMouseOver || isMouseDragging)
+        g.fillAll (Colours::yellow.withAlpha (0.4f));
+}
+
+void LookAndFeel_V3::drawScrollbar (Graphics& g, ScrollBar& scrollbar, int x, int y, int width, int height,
+                                    bool isScrollbarVertical, int thumbStartPosition, int thumbSize, bool isMouseOver, bool isMouseDown)
+{
+    Path thumbPath;
+
+    if (thumbSize > 0)
+    {
+        const float thumbIndent = (isScrollbarVertical ? width : height) * 0.25f;
+        const float thumbIndentx2 = thumbIndent * 2.0f;
+
+        if (isScrollbarVertical)
+            thumbPath.addRoundedRectangle (x + thumbIndent, thumbStartPosition + thumbIndent,
+                                           width - thumbIndentx2, thumbSize - thumbIndentx2, (width - thumbIndentx2) * 0.5f);
+        else
+            thumbPath.addRoundedRectangle (thumbStartPosition + thumbIndent, y + thumbIndent,
+                                           thumbSize - thumbIndentx2, height - thumbIndentx2, (height - thumbIndentx2) * 0.5f);
+    }
+
+    Colour thumbCol (scrollbar.findColour (ScrollBar::thumbColourId, true));
+
+    if (isMouseOver || isMouseDown)
+        thumbCol = thumbCol.withMultipliedAlpha (2.0f);
+
+    g.setColour (thumbCol);
+    g.fillPath (thumbPath);
+
+    g.setColour (thumbCol.contrasting ((isMouseOver  || isMouseDown) ? 0.2f : 0.1f));
+    g.strokePath (thumbPath, PathStrokeType (1.0f));
+}
+
+void LookAndFeel_V3::drawConcertinaPanelHeader (Graphics& g, const Rectangle<int>& area,
+                                                bool isMouseOver, bool /*isMouseDown*/,
+                                                ConcertinaPanel&, Component& panel)
+{
+    const Colour bkg (Colours::grey);
+
+    g.setGradientFill (ColourGradient (Colours::white.withAlpha (isMouseOver ? 0.4f : 0.2f), 0, (float) area.getY(),
+                                       Colours::darkgrey.withAlpha (0.2f), 0, (float) area.getBottom(), false));
+    g.fillAll();
+
+    g.setColour (bkg.contrasting().withAlpha (0.04f));
+    g.fillRect (area.withHeight (1));
+    g.fillRect (area.withTop (area.getBottom() - 1));
+
+    g.setColour (bkg.contrasting());
+    g.setFont (Font (area.getHeight() * 0.6f).boldened());
+    g.drawFittedText (panel.getName(), 4, 0, area.getWidth() - 6, area.getHeight(), Justification::centredLeft, 1);
+}
+
+static void drawButtonShape (Graphics& g, const Path& outline, Colour baseColour, float height)
+{
+    const float mainBrightness = baseColour.getBrightness();
+    const float mainAlpha = baseColour.getFloatAlpha();
+
+    g.setGradientFill (ColourGradient (baseColour.brighter (0.2f), 0.0f, 0.0f,
+                                       baseColour.darker (0.25f), 0.0f, height, false));
+    g.fillPath (outline);
+
+    g.setColour (Colours::white.withAlpha (0.4f * mainAlpha * mainBrightness * mainBrightness));
+    g.strokePath (outline, PathStrokeType (1.0f), AffineTransform::translation (0.0f, 1.0f)
+                                                        .scaled (1.0f, (height - 1.6f) / height));
+
+    g.setColour (Colours::black.withAlpha (0.4f * mainAlpha));
+    g.strokePath (outline, PathStrokeType (1.0f));
+}
+
+void LookAndFeel_V3::drawButtonBackground (Graphics& g, Button& button, const Colour& backgroundColour,
+                                           bool isMouseOverButton, bool isButtonDown)
+{
+    Colour baseColour (backgroundColour.withMultipliedSaturation (button.hasKeyboardFocus (true) ? 1.3f : 0.9f)
+                                       .withMultipliedAlpha (button.isEnabled() ? 0.9f : 0.5f));
+
+    if (isButtonDown || isMouseOverButton)
+        baseColour = baseColour.contrasting (isButtonDown ? 0.2f : 0.1f);
+
+    const bool flatOnLeft   = button.isConnectedOnLeft();
+    const bool flatOnRight  = button.isConnectedOnRight();
+    const bool flatOnTop    = button.isConnectedOnTop();
+    const bool flatOnBottom = button.isConnectedOnBottom();
+
+    const float width  = button.getWidth() - 1.0f;
+    const float height = button.getHeight() - 1.0f;
+    const float cornerSize = 4.0f;
+
+    Path outline;
+    outline.addRoundedRectangle (0.5f, 0.5f, width, height, cornerSize, cornerSize,
+                                 ! (flatOnLeft  || flatOnTop),
+                                 ! (flatOnRight || flatOnTop),
+                                 ! (flatOnLeft  || flatOnBottom),
+                                 ! (flatOnRight || flatOnBottom));
+
+    drawButtonShape (g, outline, baseColour, height);
+}
+
+void LookAndFeel_V3::drawTableHeaderBackground (Graphics& g, TableHeaderComponent& header)
+{
+    Rectangle<int> r (header.getLocalBounds());
+
+    g.setColour (Colours::black.withAlpha (0.5f));
+    g.fillRect (r.removeFromBottom (1));
+
+    g.setColour (Colours::white.withAlpha (0.6f));
+    g.fillRect (r);
+
+    g.setColour (Colours::black.withAlpha (0.5f));
+
+    for (int i = header.getNumColumns (true); --i >= 0;)
+        g.fillRect (header.getColumnPosition (i).removeFromRight (1));
+}
+
+int LookAndFeel_V3::getTabButtonOverlap (int /*tabDepth*/)            { return -1; }
+int LookAndFeel_V3::getTabButtonSpaceAroundImage()                    { return 1; }
+
+void LookAndFeel_V3::createTabTextLayout (const TabBarButton& button, float length, float depth,
+                                          Colour colour, TextLayout& textLayout)
+{
+    Font font (depth * 0.5f);
+    font.setUnderline (button.hasKeyboardFocus (false));
+
+    AttributedString s;
+    s.setJustification (Justification::centred);
+    s.append (button.getButtonText().trim(), font, colour);
+
+    textLayout.createLayout (s, length);
+}
+
+void LookAndFeel_V3::drawTabButton (TabBarButton& button, Graphics& g, bool isMouseOver, bool isMouseDown)
+{
+    const Rectangle<int> activeArea (button.getActiveArea());
+
+    const TabbedButtonBar::Orientation o = button.getTabbedButtonBar().getOrientation();
+
+    const Colour bkg (button.getTabBackgroundColour());
+
+    if (button.getToggleState())
+    {
+        g.setColour (bkg);
+        g.fillRect (activeArea);
+    }
+    else
+    {
+        Point<int> p1, p2;
+
+        switch (o)
+        {
+            case TabbedButtonBar::TabsAtBottom:   p1 = activeArea.getBottomLeft(); p2 = activeArea.getTopLeft();    break;
+            case TabbedButtonBar::TabsAtTop:      p1 = activeArea.getTopLeft();    p2 = activeArea.getBottomLeft(); break;
+            case TabbedButtonBar::TabsAtRight:    p1 = activeArea.getTopRight();   p2 = activeArea.getTopLeft();    break;
+            case TabbedButtonBar::TabsAtLeft:     p1 = activeArea.getTopLeft();    p2 = activeArea.getTopRight();   break;
+            default:                              jassertfalse; break;
+        }
+
+        g.setGradientFill (ColourGradient (bkg.brighter (0.2f), (float) p1.x, (float) p1.y,
+                                           bkg.darker (0.1f),   (float) p2.x, (float) p2.y, false));
+        g.fillRect (activeArea);
+    }
+
+    g.setColour (bkg.contrasting (0.3f));
+    Rectangle<int> r (activeArea);
+
+    if (o != TabbedButtonBar::TabsAtBottom)   g.fillRect (r.removeFromTop (1));
+    if (o != TabbedButtonBar::TabsAtTop)      g.fillRect (r.removeFromBottom (1));
+    if (o != TabbedButtonBar::TabsAtRight)    g.fillRect (r.removeFromLeft (1));
+    if (o != TabbedButtonBar::TabsAtLeft)     g.fillRect (r.removeFromRight (1));
+
+    const float alpha = button.isEnabled() ? ((isMouseOver || isMouseDown) ? 1.0f : 0.8f) : 0.3f;
+    const Colour col (bkg.contrasting().withMultipliedAlpha (alpha));
+
+    const Rectangle<float> area (button.getTextArea().toFloat());
+
+    float length = area.getWidth();
+    float depth  = area.getHeight();
+
+    if (button.getTabbedButtonBar().isVertical())
+        std::swap (length, depth);
+
+    TextLayout textLayout;
+    createTabTextLayout (button, length, depth, col, textLayout);
+
+    AffineTransform t;
+
+    switch (o)
+    {
+        case TabbedButtonBar::TabsAtLeft:   t = t.rotated (float_Pi * -0.5f).translated (area.getX(), area.getBottom()); break;
+        case TabbedButtonBar::TabsAtRight:  t = t.rotated (float_Pi *  0.5f).translated (area.getRight(), area.getY()); break;
+        case TabbedButtonBar::TabsAtTop:
+        case TabbedButtonBar::TabsAtBottom: t = t.translated (area.getX(), area.getY()); break;
+        default:                            jassertfalse; break;
+    }
+
+    g.addTransform (t);
+    textLayout.draw (g, Rectangle<float> (length, depth));
+}
+
+void LookAndFeel_V3::drawTreeviewPlusMinusBox (Graphics& g, const Rectangle<float>& area,
+                                               Colour backgroundColour, bool isOpen, bool isMouseOver)
+{
+    Path p;
+    p.addTriangle (0.0f, 0.0f, 1.0f, isOpen ? 0.0f : 0.5f, isOpen ? 0.5f : 0.0f, 1.0f);
+
+    g.setColour (backgroundColour.contrasting().withAlpha (isMouseOver ? 0.5f : 0.3f));
+    g.fillPath (p, p.getTransformToScaleToFit (area.reduced (2, area.getHeight() / 4), true));
+}
+
+bool LookAndFeel_V3::areLinesDrawnForTreeView (TreeView&)
+{
+    return false;
+}
+
+int LookAndFeel_V3::getTreeViewIndentSize (TreeView&)
+{
+    return 20;
+}
+
+void LookAndFeel_V3::drawComboBox (Graphics& g, int width, int height, const bool isButtonDown,
+                                   int buttonX, int buttonY, int buttonW, int buttonH, ComboBox& box)
+{
+    g.fillAll (box.findColour (ComboBox::backgroundColourId));
+
+    const Colour buttonColour (box.findColour (ComboBox::buttonColourId));
+
+    if (box.isEnabled() && box.hasKeyboardFocus (false))
+    {
+        g.setColour (buttonColour);
+        g.drawRect (0, 0, width, height, 2);
+    }
+    else
+    {
+        g.setColour (box.findColour (ComboBox::outlineColourId));
+        g.drawRect (0, 0, width, height);
+    }
+
+    const float outlineThickness = box.isEnabled() ? (isButtonDown ? 1.2f : 0.5f) : 0.3f;
+
+    Path buttonShape;
+    buttonShape.addRectangle (buttonX + outlineThickness,
+                              buttonY + outlineThickness,
+                              buttonW - outlineThickness * 2.0f,
+                              buttonH - outlineThickness * 2.0f);
+
+    drawButtonShape (g, buttonShape,
+                     buttonColour.withMultipliedSaturation (box.hasKeyboardFocus (true) ? 1.3f : 0.9f)
+                                 .withMultipliedAlpha (box.isEnabled() ? 0.9f : 0.5f),
+                     (float) height);
+
+    if (box.isEnabled())
+    {
+        const float arrowX = 0.3f;
+        const float arrowH = 0.2f;
+
+        Path p;
+        p.addTriangle (buttonX + buttonW * 0.5f,            buttonY + buttonH * (0.45f - arrowH),
+                       buttonX + buttonW * (1.0f - arrowX), buttonY + buttonH * 0.45f,
+                       buttonX + buttonW * arrowX,          buttonY + buttonH * 0.45f);
+
+        p.addTriangle (buttonX + buttonW * 0.5f,            buttonY + buttonH * (0.55f + arrowH),
+                       buttonX + buttonW * (1.0f - arrowX), buttonY + buttonH * 0.55f,
+                       buttonX + buttonW * arrowX,          buttonY + buttonH * 0.55f);
+
+        g.setColour (box.findColour (ComboBox::arrowColourId));
+        g.fillPath (p);
+    }
+}
+
+void LookAndFeel_V3::drawPopupMenuBackground (Graphics& g, int width, int height)
+{
+    g.fillAll (findColour (PopupMenu::backgroundColourId));
+    (void) width; (void) height;
+
+   #if ! JUCE_MAC
+    g.setColour (findColour (PopupMenu::textColourId).withAlpha (0.6f));
+    g.drawRect (0, 0, width, height);
+   #endif
+}
+
+void LookAndFeel_V3::drawKeymapChangeButton (Graphics& g, int width, int height,
+                                             Button& button, const String& keyDescription)
+{
+    const Colour textColour (button.findColour (0x100ad01 /*KeyMappingEditorComponent::textColourId*/, true));
+
+    if (keyDescription.isNotEmpty())
+    {
+        if (button.isEnabled())
+        {
+            g.setColour (textColour.withAlpha (button.isDown() ? 0.4f : (button.isOver() ? 0.2f : 0.1f)));
+            g.fillRoundedRectangle (button.getLocalBounds().toFloat(), 4.0f);
+            g.drawRoundedRectangle (button.getLocalBounds().toFloat(), 4.0f, 1.0f);
+        }
+
+        g.setColour (textColour);
+        g.setFont (height * 0.6f);
+        g.drawFittedText (keyDescription, 4, 0, width - 8, height, Justification::centred, 1);
+    }
+    else
+    {
+        const float thickness = 7.0f;
+        const float indent = 22.0f;
+
+        Path p;
+        p.addEllipse (0.0f, 0.0f, 100.0f, 100.0f);
+        p.addRectangle (indent, 50.0f - thickness, 100.0f - indent * 2.0f, thickness * 2.0f);
+        p.addRectangle (50.0f - thickness, indent, thickness * 2.0f, 50.0f - indent - thickness);
+        p.addRectangle (50.0f - thickness, 50.0f + thickness, thickness * 2.0f, 50.0f - indent - thickness);
+        p.setUsingNonZeroWinding (false);
+
+        g.setColour (textColour.darker(0.1f).withAlpha (button.isDown() ? 0.7f : (button.isOver() ? 0.5f : 0.3f)));
+        g.fillPath (p, p.getTransformToScaleToFit (2.0f, 2.0f, width - 4.0f, height - 4.0f, true));
+    }
+
+    if (button.hasKeyboardFocus (false))
+    {
+        g.setColour (textColour.withAlpha (0.4f));
+        g.drawRect (0, 0, width, height);
+    }
+}

modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h

@@ -0,0 +1,79 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission is granted to use this software under the terms of either:
+   a) the GPL v2 (or any later version)
+   b) the Affero GPL v3
+
+   Details of these licenses can be found at: www.gnu.org/licenses
+
+   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   ------------------------------------------------------------------------------
+
+   To release a closed-source product which uses JUCE, commercial licenses are
+   available: visit www.juce.com for more information.
+
+  ==============================================================================
+*/
+
+#ifndef JUCE_LOOKANDFEEL_V3_H_INCLUDED
+#define JUCE_LOOKANDFEEL_V3_H_INCLUDED
+
+//==============================================================================
+/**
+    The latest JUCE look-and-feel style, as introduced in 2013.
+    @see LookAndFeel, LookAndFeel_V1, LookAndFeel_V2
+*/
+class JUCE_API  LookAndFeel_V3   : public LookAndFeel_V2
+{
+public:
+    LookAndFeel_V3();
+    ~LookAndFeel_V3();
+
+    //==============================================================================
+    void drawButtonBackground (Graphics&, Button&, const Colour& backgroundColour,
+                               bool isMouseOverButton, bool isButtonDown) override;
+
+    void drawTableHeaderBackground (Graphics&, TableHeaderComponent&) override;
+
+    void drawTreeviewPlusMinusBox (Graphics&, const Rectangle<float>& area,
+                                   Colour backgroundColour, bool isOpen, bool isMouseOver) override;
+    bool areLinesDrawnForTreeView (TreeView&) override;
+    int getTreeViewIndentSize (TreeView&) override;
+
+    void drawComboBox (Graphics& g, int width, int height, bool isButtonDown,
+                       int buttonX, int buttonY, int buttonW, int buttonH, ComboBox& box) override;
+
+    void drawKeymapChangeButton (Graphics& g, int width, int height, Button& button, const String& keyDescription) override;
+
+    void drawPopupMenuBackground (Graphics& g, int width, int height) override;
+
+    int getTabButtonOverlap (int tabDepth) override;
+    int getTabButtonSpaceAroundImage() override;
+    void drawTabButton (TabBarButton&, Graphics&, bool isMouseOver, bool isMouseDown) override;
+
+    void drawStretchableLayoutResizerBar (Graphics&, int w, int h, bool isVerticalBar, bool isMouseOver, bool isMouseDragging) override;
+
+    bool areScrollbarButtonsVisible() override;
+
+    void drawScrollbar (Graphics&, ScrollBar&, int x, int y, int width, int height, bool isScrollbarVertical,
+                        int thumbStartPosition, int thumbSize, bool isMouseOver, bool isMouseDown) override;
+
+    void drawConcertinaPanelHeader (Graphics&, const Rectangle<int>& area, bool isMouseOver, bool isMouseDown,
+                                    ConcertinaPanel&, Component&) override;
+
+    static void createTabTextLayout (const TabBarButton& button, float length, float depth, Colour colour, TextLayout&);
+
+private:
+    Image backgroundTexture;
+    Colour backgroundTextureBaseColour;
+};
+
+
+#endif   // JUCE_LOOKANDFEEL_H_INCLUDED

modules/juce_gui_basics/menus/juce_PopupMenu.h

@@ -480,6 +480,62 @@ public:
     void addCustomItem (int itemResultID, CustomComponent* customComponent,
                         const PopupMenu* optionalSubMenu = nullptr);
 
+
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        menu drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        /** Fills the background of a popup menu component. */
+        virtual void drawPopupMenuBackground (Graphics&, int width, int height) = 0;
+
+        /** Draws one of the items in a popup menu. */
+        virtual void drawPopupMenuItem (Graphics&, int width, int height,
+                                        bool isSeparator, bool isActive, bool isHighlighted,
+                                        bool isTicked, bool hasSubMenu,
+                                        const String& text,
+                                        const String& shortcutKeyText,
+                                        Image* icon,
+                                        const Colour* textColour) = 0;
+
+        /** Returns the size and style of font to use in popup menus. */
+        virtual Font getPopupMenuFont() = 0;
+
+        virtual void drawPopupMenuUpDownArrow (Graphics&,
+                                               int width, int height,
+                                               bool isScrollUpArrow) = 0;
+
+        /** Finds the best size for an item in a popup menu. */
+        virtual void getIdealPopupMenuItemSize (const String& text,
+                                                bool isSeparator,
+                                                int standardMenuItemHeight,
+                                                int& idealWidth,
+                                                int& idealHeight) = 0;
+
+        virtual int getMenuWindowFlags() = 0;
+
+        virtual void drawMenuBarBackground (Graphics&, int width, int height,
+                                            bool isMouseOverBar,
+                                            MenuBarComponent&) = 0;
+
+        virtual int getDefaultMenuBarHeight() = 0;
+
+        virtual int getMenuBarItemWidth (MenuBarComponent&, int itemIndex, const String& itemText) = 0;
+
+        virtual Font getMenuBarFont (MenuBarComponent&, int itemIndex, const String& itemText) = 0;
+
+        virtual void drawMenuBarItem (Graphics&, int width, int height,
+                                      int itemIndex,
+                                      const String& itemText,
+                                      bool isMouseOverItem,
+                                      bool isMenuOpen,
+                                      bool isMouseOverBar,
+                                      MenuBarComponent&) = 0;
+    };
+
 private:
     //==============================================================================
     JUCE_PUBLIC_IN_DLL_BUILD (class Item)

modules/juce_gui_basics/misc/juce_BubbleComponent.h

@@ -136,6 +136,19 @@ public:
         outlineColourId               = 0x1000af1  /**< The colour to use for an outline around the bubble. */
     };
 
+
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawBubble (Graphics&, BubbleComponent&,
+                                 const Point<float>& positionOfTip,
+                                 const Rectangle<float>& body) = 0;
+    };
+
 protected:
     //==============================================================================
     /** Subclasses should override this to return the size of the content they

modules/juce_gui_basics/properties/juce_PropertyComponent.h

@@ -102,6 +102,18 @@ public:
     /** By default, this just repaints the component. */
     void enablementChanged() override;
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawPropertyPanelSectionHeader (Graphics&, const String& name, bool isOpen, int width, int height) = 0;
+        virtual void drawPropertyComponentBackground (Graphics&, int width, int height, PropertyComponent&) = 0;
+        virtual void drawPropertyComponentLabel (Graphics&, int width, int height, PropertyComponent&) = 0;
+        virtual Rectangle<int> getPropertyComponentContentPosition (PropertyComponent&) = 0;
+    };
+
 protected:
     /** Used by the PropertyPanel to determine how high this component needs to be.
         A subclass can update this value in its constructor but shouldn't alter it later

modules/juce_gui_basics/widgets/juce_ComboBox.h

@@ -333,6 +333,25 @@ public:
         arrowColourId       = 0x1000e00,    /**< The colour for the arrow shape that pops up the menu */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        ComboBox functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawComboBox (Graphics&, int width, int height, bool isButtonDown,
+                                   int buttonX, int buttonY, int buttonW, int buttonH,
+                                   ComboBox&) = 0;
+
+        virtual Font getComboBoxFont (ComboBox&) = 0;
+
+        virtual Label* createComboBoxTextBox (ComboBox&) = 0;
+
+        virtual void positionComboBoxText (ComboBox&, Label& labelToPosition) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void labelTextChanged (Label*) override;

modules/juce_gui_basics/widgets/juce_Label.h

@@ -249,6 +249,18 @@ public:
     /** Returns the currently-visible text editor, or nullptr if none is open. */
     TextEditor* getCurrentTextEditor() const noexcept;
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        label drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawLabel (Graphics&, Label&) = 0;
+        virtual Font getLabelFont (Label&) = 0;
+    };
+
 protected:
     //==============================================================================
     /** Creates the TextEditor component that will be used when the user has clicked on the label.

modules/juce_gui_basics/widgets/juce_ProgressBar.h

@@ -90,6 +90,24 @@ public:
                                                              classes will probably use variations on this colour. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        /** Draws a progress bar.
+
+            If the progress value is less than 0 or greater than 1.0, this should draw a spinning
+            bar that fills the whole space (i.e. to say that the app is still busy but the progress
+            isn't known). It can use the current time as a basis for playing an animation.
+
+            (Used by progress bars in AlertWindow).
+        */
+        virtual void drawProgressBar (Graphics&, ProgressBar&, int width, int height,
+                                      double progress, const String& textToShow) = 0;
+    };
+
 protected:
     //==============================================================================
     /** @internal */

modules/juce_gui_basics/widgets/juce_Slider.h

@@ -762,6 +762,57 @@ public:
         textBoxOutlineColourId      = 0x1001700   /**< The colour to use for a border around the text-editor box. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        slider drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        //==============================================================================
+        virtual void drawLinearSlider (Graphics&,
+                                       int x, int y, int width, int height,
+                                       float sliderPos,
+                                       float minSliderPos,
+                                       float maxSliderPos,
+                                       const Slider::SliderStyle,
+                                       Slider&) = 0;
+
+        virtual void drawLinearSliderBackground (Graphics&,
+                                                 int x, int y, int width, int height,
+                                                 float sliderPos,
+                                                 float minSliderPos,
+                                                 float maxSliderPos,
+                                                 const Slider::SliderStyle style,
+                                                 Slider&) = 0;
+
+        virtual void drawLinearSliderThumb (Graphics&,
+                                            int x, int y, int width, int height,
+                                            float sliderPos,
+                                            float minSliderPos,
+                                            float maxSliderPos,
+                                            const Slider::SliderStyle,
+                                            Slider&) = 0;
+
+        virtual int getSliderThumbRadius (Slider&) = 0;
+
+        virtual void drawRotarySlider (Graphics&,
+                                       int x, int y, int width, int height,
+                                       float sliderPosProportional,
+                                       float rotaryStartAngle,
+                                       float rotaryEndAngle,
+                                       Slider&) = 0;
+
+        virtual Button* createSliderButton (bool isIncrement) = 0;
+        virtual Label* createSliderTextBox (Slider&) = 0;
+
+        virtual ImageEffectFilter* getSliderEffect() = 0;
+
+        virtual Font getSliderPopupFont() = 0;
+        virtual int getSliderPopupPlacement() = 0;
+    };
+
 protected:
     //==============================================================================
     /** @internal */

modules/juce_gui_basics/widgets/juce_TableHeaderComponent.h

@@ -366,6 +366,19 @@ public:
     */
     virtual void reactToMenuItem (int menuReturnId, int columnIdClicked);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawTableHeaderBackground (Graphics&, TableHeaderComponent&) = 0;
+
+        virtual void drawTableHeaderColumn (Graphics&, const String& columnName, int columnId,
+                                            int width, int height,
+                                            bool isMouseOver, bool isMouseDown, int columnFlags) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/widgets/juce_TextEditor.h

@@ -580,6 +580,20 @@ public:
     void setInputRestrictions (int maxTextLength,
                                const String& allowedCharacters = String::empty);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        TextEditor drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void fillTextEditorBackground (Graphics&, int width, int height, TextEditor&) = 0;
+        virtual void drawTextEditorOutline (Graphics&, int width, int height, TextEditor&) = 0;
+
+        virtual CaretComponent* createCaretComponent (Component* keyFocusOwner) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/widgets/juce_Toolbar.h

@@ -267,6 +267,24 @@ public:
     bool restoreFromString (ToolbarItemFactory& factoryToUse,
                             const String& savedVersion);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void paintToolbarBackground (Graphics&, int width, int height, Toolbar&) = 0;
+
+        virtual Button* createToolbarMissingItemsButton (Toolbar&) = 0;
+
+        virtual void paintToolbarButtonBackground (Graphics&, int width, int height,
+                                                   bool isMouseOver, bool isMouseDown,
+                                                   ToolbarItemComponent&) = 0;
+
+        virtual void paintToolbarButtonLabel (Graphics&, int x, int y, int width, int height,
+                                              const String& text, ToolbarItemComponent&) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/widgets/juce_TreeView.cpp

@@ -439,7 +439,7 @@ TreeView::TreeView (const String& name)
     : Component (name),
       viewport (new TreeViewport()),
       rootItem (nullptr),
-      indentSize (24),
+      indentSize (-1),
       defaultOpenness (false),
       needsRecalculating (true),
       rootItemVisible (true),
@@ -522,6 +522,12 @@ void TreeView::setIndentSize (const int newIndentSize)
     }
 }
 
+int TreeView::getIndentSize() noexcept
+{
+    return indentSize >= 0 ? indentSize
+                           : getLookAndFeel().getTreeViewIndentSize (*this);
+}
+
 void TreeView::setDefaultOpenness (const bool isOpenByDefault)
 {
     if (defaultOpenness != isOpenByDefault)
@@ -860,7 +866,7 @@ void TreeView::recalculateIfNeeded()
 //==============================================================================
 struct TreeView::InsertPoint
 {
-    InsertPoint (const TreeView& view, const StringArray& files,
+    InsertPoint (TreeView& view, const StringArray& files,
                  const DragAndDropTarget::SourceDetails& dragSourceDetails)
         : pos (dragSourceDetails.localPosition),
           item (view.getItemAt (dragSourceDetails.localPosition.y)),
@@ -1125,7 +1131,8 @@ TreeViewItem::TreeViewItem()
       totalWidth (0),
       selected (false),
       redrawNeeded (true),
-      drawLinesInside (true),
+      drawLinesInside (false),
+      drawLinesSet (false),
       drawsInLeftMargin (false),
       openness (opennessDefault)
 {
@@ -1495,6 +1502,12 @@ namespace TreeViewHelpers
     }
 }
 
+bool TreeViewItem::areLinesDrawn() const
+{
+    return drawLinesSet ? drawLinesInside
+                        : (ownerView != nullptr && ownerView->getLookAndFeel().areLinesDrawnForTreeView (*ownerView));
+}
+
 void TreeViewItem::paintRecursively (Graphics& g, int width)
 {
     jassert (ownerView != nullptr);
@@ -1526,11 +1539,12 @@ void TreeViewItem::paintRecursively (Graphics& g, int width)
     {
         float x = (depth + 0.5f) * indentWidth;
 
-        if (parentItem != nullptr && parentItem->drawLinesInside)
+        const bool parentLinesDrawn = parentItem != nullptr && parentItem->areLinesDrawn();
+
+        if (parentLinesDrawn)
             paintVerticalConnectingLine (g, Line<float> (x, 0, x, isLastOfSiblings() ? halfH : (float) itemHeight));
 
-        if ((parentItem != nullptr && parentItem->drawLinesInside)
-             || (parentItem == nullptr && drawLinesInside))
+        if (parentLinesDrawn || (parentItem == nullptr && areLinesDrawn()))
             paintHorizontalConnectingLine (g, Line<float> (x, halfH, x + indentWidth / 2, halfH));
 
         {
@@ -1541,8 +1555,7 @@ void TreeViewItem::paintRecursively (Graphics& g, int width)
             {
                 x -= (float) indentWidth;
 
-                if ((p->parentItem == nullptr || p->parentItem->drawLinesInside)
-                     && ! p->isLastOfSiblings())
+                if ((p->parentItem == nullptr || p->parentItem->areLinesDrawn()) && ! p->isLastOfSiblings())
                     p->paintVerticalConnectingLine (g, Line<float> (x, 0, x, (float) itemHeight));
 
                 p = p->parentItem;
@@ -1730,6 +1743,7 @@ int TreeViewItem::getRowNumberInTree() const noexcept
 void TreeViewItem::setLinesDrawnForSubItems (const bool drawLines) noexcept
 {
     drawLinesInside = drawLines;
+    drawLinesSet = true;
 }
 
 TreeViewItem* TreeViewItem::getNextVisibleItem (const bool recurse) const noexcept

modules/juce_gui_basics/widgets/juce_TreeView.h

@@ -192,7 +192,7 @@ public:
     bool areAllParentsOpen() const noexcept;
 
     /** Changes whether lines are drawn to connect any sub-items to this item.
-        By default, line-drawing is turned on.
+        By default, line-drawing is turned on according to LookAndFeel::areLinesDrawnForTreeView().
     */
     void setLinesDrawnForSubItems (bool shouldDrawLines) noexcept;
 
@@ -542,6 +542,7 @@ private:
     bool selected           : 1;
     bool redrawNeeded       : 1;
     bool drawLinesInside    : 1;
+    bool drawLinesSet       : 1;
     bool drawsInLeftMargin  : 1;
     unsigned int openness   : 2;
 
@@ -566,6 +567,7 @@ private:
     XmlElement* getOpennessState (bool canReturnNull) const;
     bool removeSubItemFromList (int index, bool deleteItem);
     void removeAllSubItemsFromList();
+    bool areLinesDrawn() const;
 
    #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
     // The parameters for these methods have changed - please update your code!
@@ -738,7 +740,7 @@ public:
     /** Returns the number of pixels by which each nested level of the tree is indented.
         @see setIndentSize
     */
-    int getIndentSize() const noexcept                              { return indentSize; }
+    int getIndentSize() noexcept;
 
     /** Changes the distance by which each nested level of the tree is indented.
         @see getIndentSize
@@ -802,6 +804,21 @@ public:
         selectedItemBackgroundColourId = 0x1000503  /**< The colour to use to fill the background of any selected items. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        treeview drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawTreeviewPlusMinusBox (Graphics&, const Rectangle<float>& area,
+                                               Colour backgroundColour, bool isItemOpen, bool isMouseOver) = 0;
+
+        virtual bool areLinesDrawnForTreeView (TreeView&) = 0;
+        virtual int getTreeViewIndentSize (TreeView&) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/windows/juce_AlertWindow.h

@@ -417,6 +417,32 @@ public:
         outlineColourId             = 0x1001820   /**< An optional colour to use to draw a border around the window. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        alert-window drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual AlertWindow* createAlertWindow (const String& title, const String& message,
+                                                const String& button1,
+                                                const String& button2,
+                                                const String& button3,
+                                                AlertWindow::AlertIconType iconType,
+                                                int numButtons,
+                                                Component* associatedComponent) = 0;
+
+        virtual void drawAlertBox (Graphics&, AlertWindow&, const Rectangle<int>& textArea, TextLayout&) = 0;
+
+        virtual int getAlertBoxWindowFlags() = 0;
+
+        virtual int getAlertWindowButtonHeight() = 0;
+
+        virtual Font getAlertWindowMessageFont() = 0;
+        virtual Font getAlertWindowFont() = 0;
+    };
+
 protected:
     //==============================================================================
     /** @internal */

modules/juce_gui_basics/windows/juce_CallOutBox.h

@@ -118,6 +118,15 @@ public:
                                              const Rectangle<int>& areaToPointTo,
                                              Component* parentComponent);
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes. */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawCallOutBoxBackground (CallOutBox&, Graphics&, const Path&, Image& cachedImage) = 0;
+    };
+
     //==============================================================================
     /** @internal */
     void paint (Graphics&) override;

modules/juce_gui_basics/windows/juce_DocumentWindow.h

@@ -223,6 +223,30 @@ public:
                                                        and feel class how this is used. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        window drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void drawDocumentWindowTitleBar (DocumentWindow&,
+                                                 Graphics&, int w, int h,
+                                                 int titleSpaceX, int titleSpaceW,
+                                                 const Image* icon,
+                                                 bool drawTitleTextOnLeft) = 0;
+
+        virtual Button* createDocumentWindowButton (int buttonType) = 0;
+
+        virtual void positionDocumentWindowButtons (DocumentWindow&,
+                                                    int titleBarX, int titleBarY, int titleBarW, int titleBarH,
+                                                    Button* minimiseButton,
+                                                    Button* maximiseButton,
+                                                    Button* closeButton,
+                                                    bool positionTitleBarButtonsOnLeft) = 0;
+    };
+
     //==============================================================================
    #ifndef DOXYGEN
     /** @internal */

modules/juce_gui_basics/windows/juce_ResizableWindow.h

@@ -306,8 +306,23 @@ public:
                                                bool resizeToFit = false));
     using TopLevelWindow::addToDesktop;
 
-protected:
     //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        window drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        //==============================================================================
+        virtual void drawCornerResizer (Graphics&, int w, int h, bool isMouseOver, bool isMouseDragging) = 0;
+        virtual void drawResizableFrame (Graphics&, int w, int h, const BorderSize<int>&) = 0;
+
+        virtual void fillResizableWindowBackground (Graphics&, int w, int h, const BorderSize<int>&, ResizableWindow&) = 0;
+        virtual void drawResizableWindowBorder (Graphics&, int w, int h, const BorderSize<int>& border, ResizableWindow&) = 0;
+    };
+
+protected:
     /** @internal */
     void paint (Graphics&) override;
     /** (if overriding this, make sure you call ResizableWindow::moved() in your subclass) */

modules/juce_gui_basics/windows/juce_TooltipWindow.h

@@ -96,6 +96,17 @@ public:
         outlineColourId         = 0x1001c10     /**< The colour to use to draw an outline around the tooltip. */
     };
 
+    //==============================================================================
+    /** This abstract base class is implemented by LookAndFeel classes to provide
+        window drawing functionality.
+    */
+    struct JUCE_API  LookAndFeelMethods
+    {
+        virtual ~LookAndFeelMethods() {}
+
+        virtual void getTooltipSize (const String& tipText, int& width, int& height) = 0;
+        virtual void drawTooltip (Graphics&, const String& text, int width, int height) = 0;
+    };
 
 private:
     //==============================================================================

modules/juce_gui_extra/juce_gui_extra.cpp

@@ -86,7 +86,6 @@ namespace juce
 #include "code_editor/juce_CodeDocument.cpp"
 #include "code_editor/juce_CodeEditorComponent.cpp"
 #include "code_editor/juce_CPlusPlusCodeTokeniser.cpp"
-#include "lookandfeel/juce_OldSchoolLookAndFeel.cpp"
 #include "misc/juce_BubbleMessageComponent.cpp"
 #include "misc/juce_ColourSelector.cpp"
 #include "misc/juce_KeyMappingEditorComponent.cpp"

modules/juce_gui_extra/juce_gui_extra.h

@@ -50,7 +50,6 @@ namespace juce
 #include "embedding/juce_ActiveXControlComponent.h"
 #include "embedding/juce_NSViewComponent.h"
 #include "embedding/juce_UIViewComponent.h"
-#include "lookandfeel/juce_OldSchoolLookAndFeel.h"
 #include "misc/juce_AppleRemote.h"
 #include "misc/juce_BubbleMessageComponent.h"
 #include "misc/juce_ColourSelector.h"

modules/juce_gui_extra/lookandfeel/juce_OldSchoolLookAndFeel.h

@@ -1,156 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library.
-   Copyright (c) 2013 - Raw Material Software Ltd.
-
-   Permission is granted to use this software under the terms of either:
-   a) the GPL v2 (or any later version)
-   b) the Affero GPL v3
-
-   Details of these licenses can be found at: www.gnu.org/licenses
-
-   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-   ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.juce.com for more information.
-
-  ==============================================================================
-*/
-
-#ifndef JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED
-#define JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED
-
-
-//==============================================================================
-/**
-    The original Juce look-and-feel.
-
-*/
-class JUCE_API  OldSchoolLookAndFeel    : public LookAndFeel
-{
-public:
-    //==============================================================================
-    /** Creates the default JUCE look and feel. */
-    OldSchoolLookAndFeel();
-
-    /** Destructor. */
-    virtual ~OldSchoolLookAndFeel();
-
-    //==============================================================================
-    /** Draws the lozenge-shaped background for a standard button. */
-    virtual void drawButtonBackground (Graphics& g,
-                                       Button& button,
-                                       const Colour& backgroundColour,
-                                       bool isMouseOverButton,
-                                       bool isButtonDown);
-
-
-    /** Draws the contents of a standard ToggleButton. */
-    virtual void drawToggleButton (Graphics& g,
-                                   ToggleButton& button,
-                                   bool isMouseOverButton,
-                                   bool isButtonDown);
-
-    virtual void drawTickBox (Graphics& g,
-                              Component& component,
-                              float x, float y, float w, float h,
-                              bool ticked,
-                              bool isEnabled,
-                              bool isMouseOverButton,
-                              bool isButtonDown);
-
-    //==============================================================================
-    virtual void drawProgressBar (Graphics& g, ProgressBar& progressBar,
-                                  int width, int height,
-                                  double progress, const String& textToShow);
-
-    //==============================================================================
-    virtual void drawScrollbarButton (Graphics& g,
-                                      ScrollBar& scrollbar,
-                                      int width, int height,
-                                      int buttonDirection,
-                                      bool isScrollbarVertical,
-                                      bool isMouseOverButton,
-                                      bool isButtonDown);
-
-    virtual void drawScrollbar (Graphics& g,
-                                ScrollBar& scrollbar,
-                                int x, int y,
-                                int width, int height,
-                                bool isScrollbarVertical,
-                                int thumbStartPosition,
-                                int thumbSize,
-                                bool isMouseOver,
-                                bool isMouseDown);
-
-    virtual ImageEffectFilter* getScrollbarEffect();
-
-    //==============================================================================
-    virtual void drawTextEditorOutline (Graphics& g,
-                                        int width, int height,
-                                        TextEditor& textEditor);
-
-    //==============================================================================
-    /** Fills the background of a popup menu component. */
-    virtual void drawPopupMenuBackground (Graphics& g, int width, int height);
-
-    virtual void drawMenuBarBackground (Graphics& g, int width, int height,
-                                        bool isMouseOverBar,
-                                        MenuBarComponent& menuBar);
-
-    //==============================================================================
-    virtual void drawComboBox (Graphics& g, int width, int height,
-                               bool isButtonDown,
-                               int buttonX, int buttonY,
-                               int buttonW, int buttonH,
-                               ComboBox& box);
-
-    virtual Font getComboBoxFont (ComboBox& box);
-
-    //==============================================================================
-    virtual void drawLinearSlider (Graphics& g,
-                                   int x, int y,
-                                   int width, int height,
-                                   float sliderPos,
-                                   float minSliderPos,
-                                   float maxSliderPos,
-                                   const Slider::SliderStyle style,
-                                   Slider& slider);
-
-    virtual int getSliderThumbRadius (Slider& slider);
-
-    virtual Button* createSliderButton (bool isIncrement);
-
-    virtual ImageEffectFilter* getSliderEffect();
-
-    //==============================================================================
-    virtual void drawCornerResizer (Graphics& g,
-                                    int w, int h,
-                                    bool isMouseOver,
-                                    bool isMouseDragging);
-
-    virtual Button* createDocumentWindowButton (int buttonType);
-
-    virtual void positionDocumentWindowButtons (DocumentWindow& window,
-                                                int titleBarX, int titleBarY,
-                                                int titleBarW, int titleBarH,
-                                                Button* minimiseButton,
-                                                Button* maximiseButton,
-                                                Button* closeButton,
-                                                bool positionTitleBarButtonsOnLeft);
-
-
-private:
-    //==============================================================================
-    DropShadowEffect scrollbarShadow;
-
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OldSchoolLookAndFeel)
-};
-
-
-#endif   // JUCE_OLDSCHOOLLOOKANDFEEL_H_INCLUDED

modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.cpp

@@ -294,20 +294,14 @@ public:
 
     String getUniqueName() const override       { return categoryName + "_cat"; }
     bool mightContainSubItems() override        { return true; }
-    int getItemHeight() const override          { return 24; }
+    int getItemHeight() const override          { return 22; }
 
     void paintItem (Graphics& g, int width, int height) override
     {
         g.setFont (Font (height * 0.7f, Font::bold));
         g.setColour (owner.findColour (KeyMappingEditorComponent::textColourId));
 
-        g.drawText (TRANS (categoryName), 2, 0, width - 2, height,
-                    Justification::centredLeft, true);
-    }
-
-    void paintOpenCloseButton (Graphics& g, const Rectangle<float>& area, Colour backgroundColour, bool isMouseOver) override
-    {
-        TreeViewItem::paintOpenCloseButton (g, area.reduced (4), backgroundColour, isMouseOver);
+        g.drawText (TRANS (categoryName), 2, 0, width - 2, height, Justification::centredLeft, true);
     }
 
     void itemOpennessChanged (bool isNowOpen) override
@@ -418,6 +412,7 @@ KeyMappingEditorComponent::KeyMappingEditorComponent (KeyPressMappingSet& mappin
     tree.setRootItemVisible (false);
     tree.setDefaultOpenness (true);
     tree.setRootItem (treeItem);
+    tree.setIndentSize (12);
 }
 
 KeyMappingEditorComponent::~KeyMappingEditorComponent()