From 4c87324e8684aba87f036941dbee19aae0b99425 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 5 Nov 2014 16:42:42 +0000
Subject: [PATCH] Added blank project and made examples button work

---
 .../Builds/CodeBlocks/The Introjucer.cbp      |  4 +
 .../The Introjucer.xcodeproj/project.pbxproj  |  2 +
 .../VisualStudio2005/The Introjucer.vcproj    |  1 +
 .../VisualStudio2008/The Introjucer.vcproj    |  1 +
 .../VisualStudio2010/The Introjucer.vcxproj   |  1 +
 .../The Introjucer.vcxproj.filters            |  3 +
 .../VisualStudio2012/The Introjucer.vcxproj   |  1 +
 .../The Introjucer.vcxproj.filters            |  3 +
 .../VisualStudio2013/The Introjucer.vcxproj   |  1 +
 .../The Introjucer.vcxproj.filters            |  3 +
 extras/Introjucer/Introjucer.jucer            |  2 +
 .../Introjucer/JuceLibraryCode/BinaryData.cpp |  8 +-
 .../Wizards/jucer_NewProjectWizardClasses.cpp |  4 +-
 .../Wizards/jucer_ProjectWizard_Animated.h    |  2 +
 .../Wizards/jucer_ProjectWizard_AudioApp.h    |  2 +
 .../Wizards/jucer_ProjectWizard_AudioPlugin.h |  2 +
 .../Wizards/jucer_ProjectWizard_Blank.h       | 45 +++++++++
 .../Wizards/jucer_ProjectWizard_Console.h     |  2 +
 .../Source/Wizards/jucer_ProjectWizard_DLL.h  |  2 +
 .../Wizards/jucer_ProjectWizard_GUIApp.h      |  2 +
 .../jucer_ProjectWizard_StaticLibrary.h       |  2 +
 .../Wizards/jucer_ProjectWizard_openGL.h      |  2 +
 .../Source/Wizards/jucer_StartPageComponent.h |  4 +-
 .../jucer_TemplateThumbnailsComponent.h       | 94 +++++++++++++------
 24 files changed, 156 insertions(+), 37 deletions(-)
 create mode 100644 extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Blank.h

diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index 70c1fa0e28..356d9c7d63 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
@@ -594,6 +594,10 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../Source/Wizards/jucer_ProjectWizard_Blank.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../Source/Wizards/jucer_ProjectWizard_Console.h">
       <Option compile="0"/>
       <Option link="0"/>
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index 3d7d131d3a..98b9746a30 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -111,6 +111,7 @@
 		0D1C432D74433308E05942AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextDiff.cpp"; path = "../../../../modules/juce_core/text/juce_TextDiff.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0DB0A9E30EEDDEA720BC5A03 = {isa = PBXFileReference; lastKnownFileType = file.svg; name = "wizard_StaticLibrary.svg"; path = "../../Source/BinaryData/wizard_StaticLibrary.svg"; sourceTree = "SOURCE_ROOT"; };
 		0E80EFDB550393DB1C94F291 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Font.h"; path = "../../../../modules/juce_graphics/fonts/juce_Font.h"; sourceTree = "SOURCE_ROOT"; };
+		0F01067432AC314EAC213C1C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectWizard_Blank.h"; path = "../../Source/Wizards/jucer_ProjectWizard_Blank.h"; sourceTree = "SOURCE_ROOT"; };
 		0F249640243FBD5717F6ADD9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MiscUtilities.cpp"; path = "../../Source/Utility/jucer_MiscUtilities.cpp"; sourceTree = "SOURCE_ROOT"; };
 		0F2505BCD0232EB95D5199F2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../../../modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; };
 		0F382FC6B16658EF02D2C4F0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MessageListener.cpp"; path = "../../../../modules/juce_events/messages/juce_MessageListener.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1134,6 +1135,7 @@
 					3C95FA2AA91EBA19ADDD5C29,
 					8A825FDDC00DD253F44D2C3A,
 					4A4EBDAD8D098F72CE053235,
+					0F01067432AC314EAC213C1C,
 					A44A774EFC020D3D046A9249,
 					9992E6950C64322A11E39ADF,
 					05D67B5A8D64947C067C0945,
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 56a1748b6f..4aeeccf397 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -307,6 +307,7 @@
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Animated.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_AudioApp.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h"/>
+        <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Console.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_DLL.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_GUIApp.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 577691c7c6..1f0692fb33 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -307,6 +307,7 @@
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Animated.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_AudioApp.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h"/>
+        <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_Console.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_DLL.h"/>
         <File RelativePath="..\..\Source\Wizards\jucer_ProjectWizard_GUIApp.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 5ddc32df5c..0c91f89922 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -1159,6 +1159,7 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Animated.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioApp.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h"/>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_DLL.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_GUIApp.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index b0f2d7df81..bbed382711 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -1674,6 +1674,9 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h">
+      <Filter>The Introjucer\Wizards</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index 4fe92b9763..132b4f5f1c 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
@@ -1165,6 +1165,7 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Animated.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioApp.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h"/>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_DLL.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_GUIApp.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
index b0f2d7df81..bbed382711 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
@@ -1674,6 +1674,9 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h">
+      <Filter>The Introjucer\Wizards</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
index 084c153f59..1c653f9c74 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
@@ -1165,6 +1165,7 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Animated.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioApp.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h"/>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_DLL.h"/>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_GUIApp.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
index f6d4b90a60..67bfdf0429 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
@@ -1674,6 +1674,9 @@
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_AudioPlugin.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Blank.h">
+      <Filter>The Introjucer\Wizards</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Wizards\jucer_ProjectWizard_Console.h">
       <Filter>The Introjucer\Wizards</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index e21728b9be..3817ebe6a1 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -488,6 +488,8 @@
             resource="0" file="Source/Wizards/jucer_ProjectWizard_AudioApp.h"/>
       <FILE id="VslsJm" name="jucer_ProjectWizard_AudioPlugin.h" compile="0"
             resource="0" file="Source/Wizards/jucer_ProjectWizard_AudioPlugin.h"/>
+      <FILE id="YnNfnf" name="jucer_ProjectWizard_Blank.h" compile="0" resource="0"
+            file="Source/Wizards/jucer_ProjectWizard_Blank.h"/>
       <FILE id="ZGv05z" name="jucer_ProjectWizard_Console.h" compile="0"
             resource="0" file="Source/Wizards/jucer_ProjectWizard_Console.h"/>
       <FILE id="MSY7Sv" name="jucer_ProjectWizard_DLL.h" compile="0" resource="0"
diff --git a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
index 833620c2b2..87357e438f 100644
--- a/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
+++ b/extras/Introjucer/JuceLibraryCode/BinaryData.cpp
@@ -33,7 +33,7 @@ static const unsigned char temp_binary_data_0[] =
 "    //==============================================================================\r\n"
 "    MainContentComponent()\r\n"
 "    {\r\n"
-"        setSize (500, 400);\r\n"
+"        setSize (800, 600);\r\n"
 "        setFramesPerSecond (60);\r\n"
 "    }\r\n"
 "\r\n"
@@ -109,7 +109,7 @@ static const unsigned char temp_binary_data_1[] =
 "    //==============================================================================\r\n"
 "    MainContentComponent()\r\n"
 "    {\r\n"
-"        setSize (500, 400);\r\n"
+"        setSize (800, 600);\r\n"
 "\r\n"
 "        // specify the number of input and output channels that we want to open\r\n"
 "        setAudioChannels (2, 2);\r\n"
@@ -707,7 +707,7 @@ static const unsigned char temp_binary_data_8[] =
 "//==============================================================================\r\n"
 "CONTENTCOMPCLASS::CONTENTCOMPCLASS()\r\n"
 "{\r\n"
-"    setSize (500, 400);\r\n"
+"    setSize (600, 400);\r\n"
 "}\r\n"
 "\r\n"
 "CONTENTCOMPCLASS::~CONTENTCOMPCLASS()\r\n"
@@ -1343,7 +1343,7 @@ static const unsigned char temp_binary_data_20[] =
 "    //==============================================================================\r\n"
 "    MainContentComponent()\r\n"
 "    {\r\n"
-"        setSize (500, 400);\r\n"
+"        setSize (800, 600);\r\n"
 "    }\r\n"
 "\r\n"
 "    ~MainContentComponent()\r\n"
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
index bf80563a34..d9399866e6 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
+++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
@@ -44,6 +44,7 @@ struct NewProjectWizardClasses
     #include "jucer_ProjectWizard_openGL.h"
     #include "jucer_ProjectWizard_Animated.h"
     #include "jucer_ProjectWizard_AudioApp.h"
+    #include "jucer_ProjectWizard_Blank.h"
 
     #include "jucer_NewProjectWizardComponent.h"
     #include "jucer_TemplateThumbnailsComponent.h"
@@ -52,7 +53,7 @@ struct NewProjectWizardClasses
     //==============================================================================
     static int getNumWizards() noexcept
     {
-        return 8;
+        return 9;
     }
 
     static NewProjectWizard* createWizardType (int index)
@@ -67,6 +68,7 @@ struct NewProjectWizardClasses
             case 5:     return new NewProjectWizardClasses::ConsoleAppWizard();
             case 6:     return new NewProjectWizardClasses::StaticLibraryWizard();
             case 7:     return new NewProjectWizardClasses::DynamicLibraryWizard();
+            case 8:     return new NewProjectWizardClasses::BlankAppWizard();
             default:    jassertfalse; break;
         }
 
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
index f3afed12cd..d9bd450089 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Animated.h
@@ -73,4 +73,6 @@ struct AnimatedAppWizard   : public NewProjectWizard
 
         return true;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AnimatedAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
index ace6983a9a..50e476ba33 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioApp.h
@@ -80,4 +80,6 @@ struct AudioAppWizard   : public NewProjectWizard
         s.addIfNotAlreadyThere ("juce_audio_utils");
         return s;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h
index 6053d19411..cca37ff034 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_AudioPlugin.h
@@ -102,4 +102,6 @@ struct AudioPluginAppWizard   : public NewProjectWizard
 
         return true;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioPluginAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Blank.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Blank.h
new file mode 100644
index 0000000000..f808661a85
--- /dev/null
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Blank.h
@@ -0,0 +1,45 @@
+/*
+  ==============================================================================
+
+   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.
+
+  ==============================================================================
+*/
+
+
+struct BlankAppWizard   : public NewProjectWizard
+{
+    BlankAppWizard()  {}
+
+    String getName() const override         { return TRANS("Empty Application"); }
+    String getDescription() const override  { return TRANS("Creates a blank JUCE GUI application."); }
+    const char* getIcon() const override    { return BinaryData::wizard_GUI_svg; }
+
+    bool initialiseProject (Project& project)
+    {
+        createSourceFolder();
+        project.getProjectTypeValue() = ProjectType::getGUIAppTypeName();
+        Project::Item sourceGroup (createSourceGroup (project));
+        setExecutableNameForAllTargets (project, File::createLegalFileName (appTitle));
+
+        return true;
+    }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BlankAppWizard)
+};
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Console.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Console.h
index bb5ea1f2ba..57751a8258 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Console.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_Console.h
@@ -83,4 +83,6 @@ struct ConsoleAppWizard   : public NewProjectWizard
 
 private:
     bool createMainCpp;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConsoleAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_DLL.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_DLL.h
index 2951b24573..50395c4d61 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_DLL.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_DLL.h
@@ -40,4 +40,6 @@ struct DynamicLibraryWizard   : public NewProjectWizard
 
         return true;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DynamicLibraryWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h
index c9955f2506..0767ccf396 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_GUIApp.h
@@ -118,4 +118,6 @@ struct GUIAppWizard   : public NewProjectWizard
 
 private:
     bool createMainCpp, createWindow;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GUIAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_StaticLibrary.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_StaticLibrary.h
index 5ee43f80db..2aa9dcee8f 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_StaticLibrary.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_StaticLibrary.h
@@ -40,4 +40,6 @@ struct StaticLibraryWizard   : public NewProjectWizard
 
         return true;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (StaticLibraryWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_openGL.h b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_openGL.h
index ba6ce71807..2634be2f00 100644
--- a/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_openGL.h
+++ b/extras/Introjucer/Source/Wizards/jucer_ProjectWizard_openGL.h
@@ -73,4 +73,6 @@ struct OpenGLAppWizard   : public NewProjectWizard
 
         return true;
     }
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OpenGLAppWizard)
 };
diff --git a/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h b/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
index 54886a86c2..c7f18dfa3e 100644
--- a/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_StartPageComponent.h
@@ -38,12 +38,12 @@ public:
         addAndMakeVisible (panel);
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         IntrojucerLookAndFeel::fillWithBackgroundTexture (*this, g);
     }
 
-    void resized()
+    void resized() override
     {
         panel.setBounds (getLocalBounds());
     }
diff --git a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
index 50948f52f6..7c6f713bed 100644
--- a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
@@ -138,7 +138,9 @@ class TemplateTileBrowser   : public Component,
 public:
     TemplateTileBrowser (WizardComp* projectWizard)
     {
-        for (int i = 0; i < getNumWizards(); ++i)
+        const int numWizardButtons = getNumWizards() - 1; // ( - 1 because the last one is blank)
+
+        for (int i = 0; i < numWizardButtons; ++i)
         {
             ScopedPointer<NewProjectWizard> wizard (createWizardType (i));
 
@@ -154,49 +156,45 @@ public:
         // Handle Open Project button functionality
         ApplicationCommandManager& commandManager = IntrojucerApp::getCommandManager();
 
-        blankProjectButton = new TemplateOptionButton ("Create Blank Project",  TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg);
-        openProjectButton  = new TemplateOptionButton ("Open Existing Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg);
+        addAndMakeVisible (blankProjectButton   = new TemplateOptionButton ("Create Blank Project",  TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+        addAndMakeVisible (exampleProjectButton = new TemplateOptionButton ("Open Example Project",  TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+        addAndMakeVisible (openProjectButton    = new TemplateOptionButton ("Open Existing Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+
+        blankProjectButton->addListener (this);
+        exampleProjectButton->addListener (this);
         openProjectButton->setCommandToTrigger (&commandManager, CommandIDs::open, true);
 
-        exampleProjectButton = new TemplateOptionButton ("Open Example Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg);
-        exampleProjectButton->setCommandToTrigger (&commandManager, CommandIDs::open, true);
-
-        addAndMakeVisible (blankProjectButton);
-        addAndMakeVisible (openProjectButton);
-        addAndMakeVisible (exampleProjectButton);
-
         newProjectWizard = projectWizard;
     }
 
     void paint (Graphics& g) override
     {
         g.setColour (Colours::black.withAlpha (0.2f));
-        g.fillRect (0, 0, getWidth(), 60);
+        g.fillRect (getLocalBounds().removeFromTop (60));
 
         g.setColour (Colours::white);
-        g.setFont (20);
+        g.setFont (20.0f);
         g.drawText ("Create New Project", 0, 0, getWidth(), 60, Justification::centred, true);
 
         // draw the descriptions of each template if hovered;
         // (repaint is called by the button listener on change state)
-        Rectangle<int> descriptionBox = getBounds().reduced (30, 30);
-        descriptionBox = descriptionBox.removeFromBottom (50);
+        Rectangle<int> descriptionBox (getLocalBounds().reduced (30).removeFromBottom (50));
 
         g.setColour (Colours::white.withAlpha (0.4f));
-        g.setFont (15);
+        g.setFont (15.0f);
 
-        for (int i = 0; i < 8; ++i)
-            if (optionButtons.getUnchecked(i)->getState() == TemplateOptionButton::ButtonState::buttonOver)
+        for (int i = 0; i < optionButtons.size(); ++i)
+            if (optionButtons.getUnchecked(i)->isOver())
                 g.drawFittedText (optionButtons.getUnchecked(i)->getDescription(), descriptionBox, Justification::centred, 5, 1.0f);
     }
 
     void resized() override
     {
-        Rectangle<int> allOpts = getBounds().reduced (40, 60);
+        Rectangle<int> allOpts = getLocalBounds().reduced (40, 60);
         allOpts.removeFromBottom (allOpts.getHeight() * 0.25);
 
         const int numHorizIcons = 4;
-        const int optStep = allOpts.getWidth()/numHorizIcons;
+        const int optStep = allOpts.getWidth() / numHorizIcons;
 
         for (int i = 0; i < optionButtons.size(); ++i)
         {
@@ -208,7 +206,7 @@ public:
                                                         .reduced (10, 10));
         }
 
-        Rectangle<int> openButtonBounds = getBounds();
+        Rectangle<int> openButtonBounds = getLocalBounds();
         openButtonBounds.removeFromBottom (proportionOfHeight (0.12f));
         openButtonBounds = openButtonBounds.removeFromBottom (120);
         openButtonBounds.reduce (50, 40);
@@ -218,24 +216,45 @@ public:
         openProjectButton->setBounds (openButtonBounds.reduced (18, 0));
     }
 
-    void buttonClicked (Button* b) override
+    void showWizard (const String& name)
     {
-        newProjectWizard->projectType.setText (b->getButtonText());
+        newProjectWizard->projectType.setText (name);
 
         if (SlidingPanelComponent* parent = findParentComponentOfClass<SlidingPanelComponent>())
-        {
-            if (parent->getNumTabs() > 0 && b->getButtonText() != "Open Existing Project")
-                parent->goToTab (parent->getCurrentTabIndex() + 1);
-        }
+            parent->goToTab (1);
         else
-        {
             jassertfalse;
-        }
     }
 
-    void buttonStateChanged (Button*) override
+    void createBlankProject()
     {
-        repaint();
+        showWizard (BlankAppWizard().getName());
+    }
+
+    void openExampleProject()
+    {
+        FileChooser fc ("Open File", findExamplesFolder());
+
+        if (fc.browseForFileToOpen())
+            IntrojucerApp::getApp().openFile (fc.getResult());
+    }
+
+    static File findExamplesFolder()
+    {
+        File appFolder (File::getSpecialLocation (File::currentApplicationFile));
+
+        while (appFolder.exists()
+                && appFolder.getParentDirectory() != appFolder)
+        {
+            File examples (appFolder.getSiblingFile ("examples"));
+
+            if (examples.exists())
+                return examples;
+
+            appFolder = appFolder.getParentDirectory();
+        }
+
+        return File::nonexistent;
     }
 
 private:
@@ -243,6 +262,21 @@ private:
     NewProjectWizardClasses::WizardComp* newProjectWizard;
     ScopedPointer<TemplateOptionButton> blankProjectButton, openProjectButton, exampleProjectButton;
 
+    void buttonClicked (Button* b) override
+    {
+        if (b == blankProjectButton)
+            createBlankProject();
+        else if (b == exampleProjectButton)
+            openExampleProject();
+        else if (dynamic_cast<TemplateOptionButton*> (b) != nullptr)
+            showWizard (b->getButtonText());
+    }
+
+    void buttonStateChanged (Button*) override
+    {
+        repaint();
+    }
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TemplateTileBrowser)
 };