diff --git a/examples/Demo/Source/Demos/ComponentTransformsDemo.cpp b/examples/Demo/Source/Demos/ComponentTransformsDemo.cpp
index d73b826e1e..e73a5911ff 100644
--- a/examples/Demo/Source/Demos/ComponentTransformsDemo.cpp
+++ b/examples/Demo/Source/Demos/ComponentTransformsDemo.cpp
@@ -46,7 +46,7 @@ public:
         draggers.getUnchecked(2)->relativePos = Point<float> (0.05f, 0.85f);
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         fillTiledBackground (g);
 
@@ -96,7 +96,7 @@ private:
             setRepaintsOnMouseActivity (true);
         }
 
-        void paint (Graphics& g)
+        void paint (Graphics& g) override
         {
             g.setColour (Colours::white.withAlpha (isMouseOverOrDragging() ? 0.9f : 0.5f));
             g.fillEllipse (getLocalBounds().reduced (3).toFloat());
diff --git a/examples/Demo/Source/Demos/FontsDemo.cpp b/examples/Demo/Source/Demos/FontsDemo.cpp
index 97b63adde9..01cbe910c8 100644
--- a/examples/Demo/Source/Demos/FontsDemo.cpp
+++ b/examples/Demo/Source/Demos/FontsDemo.cpp
@@ -109,12 +109,12 @@ public:
     }
 
     //==============================================================================
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         fillTiledBackground (g);
     }
 
-    void resized()
+    void resized() override
     {
         Rectangle<int> r (getLocalBounds().reduced (5));
 
@@ -149,27 +149,27 @@ public:
         demoTextBox.setBounds (r);
     }
 
-    void sliderValueChanged (Slider* sliderThatWasMoved)
+    void sliderValueChanged (Slider* sliderThatWasMoved) override
     {
         if (sliderThatWasMoved == &heightSlider)            refreshPreviewBoxFont();
         else if (sliderThatWasMoved == &kerningSlider)      refreshPreviewBoxFont();
         else if (sliderThatWasMoved == &scaleSlider)        refreshPreviewBoxFont();
     }
 
-    void buttonClicked (Button* buttonThatWasClicked)
+    void buttonClicked (Button* buttonThatWasClicked) override
     {
         if (buttonThatWasClicked == &boldToggle)            refreshPreviewBoxFont();
         else if (buttonThatWasClicked == &italicToggle)     refreshPreviewBoxFont();
     }
 
     // The following methods implement the ListBoxModel virtual methods:
-    int getNumRows()
+    int getNumRows() override
     {
         return fonts.size();
     }
 
     void paintListBoxItem (int rowNumber, Graphics& g,
-                           int width, int height, bool rowIsSelected)
+                           int width, int height, bool rowIsSelected) override
     {
         if (rowIsSelected)
             g.fillAll (Colours::lightblue);
@@ -185,7 +185,7 @@ public:
         s.draw (g, Rectangle<int> (width, height).expanded (-4, 50).toFloat());
     }
 
-    void selectedRowsChanged (int /*lastRowselected*/)
+    void selectedRowsChanged (int /*lastRowselected*/) override
     {
         refreshPreviewBoxFont();
     }
diff --git a/examples/Demo/Source/Demos/GraphicsDemo.cpp b/examples/Demo/Source/Demos/GraphicsDemo.cpp
index 7b0a1d8a10..139a4c4344 100644
--- a/examples/Demo/Source/Demos/GraphicsDemo.cpp
+++ b/examples/Demo/Source/Demos/GraphicsDemo.cpp
@@ -43,7 +43,7 @@ public:
         initialiseToggle (quality, "Higher quality image interpolation", false);
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         fillTiledBackground (g);
     }
@@ -686,7 +686,7 @@ public:
         addAndMakeVisible (testList);
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         g.fillAll (Colours::grey);
     }
diff --git a/examples/Demo/Source/Demos/JavaScript.cpp b/examples/Demo/Source/Demos/JavaScript.cpp
index aef6a1ab69..be5c83e2cf 100644
--- a/examples/Demo/Source/Demos/JavaScript.cpp
+++ b/examples/Demo/Source/Demos/JavaScript.cpp
@@ -123,7 +123,7 @@ public:
     };
 
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         fillTiledBackground (g);
     }
diff --git a/examples/Demo/Source/Demos/MDIDemo.cpp b/examples/Demo/Source/Demos/MDIDemo.cpp
index 3a4b9e9733..7ec471e2d1 100644
--- a/examples/Demo/Source/Demos/MDIDemo.cpp
+++ b/examples/Demo/Source/Demos/MDIDemo.cpp
@@ -94,7 +94,7 @@ public:
         // not interested in this for now
     }
 
-    File getSuggestedSaveAsFile (const File&)
+    File getSuggestedSaveAsFile (const File&) override
     {
         return File::getSpecialLocation (File::userDesktopDirectory).getChildFile (getName()).withFileExtension ("jnote");
     }
diff --git a/examples/Demo/Source/Demos/OpenGLDemo2D.cpp b/examples/Demo/Source/Demos/OpenGLDemo2D.cpp
index 85988d0397..8a6b584dea 100644
--- a/examples/Demo/Source/Demos/OpenGLDemo2D.cpp
+++ b/examples/Demo/Source/Demos/OpenGLDemo2D.cpp
@@ -71,7 +71,7 @@ public:
         shader = nullptr;
     }
 
-    void paint (Graphics& g)
+    void paint (Graphics& g) override
     {
         g.fillCheckerBoard (getLocalBounds(), 48, 48, Colours::lightgrey, Colours::white);
 
diff --git a/examples/Demo/Source/MainWindow.cpp b/examples/Demo/Source/MainWindow.cpp
index 4108cb28d7..64c4cb0d84 100644
--- a/examples/Demo/Source/MainWindow.cpp
+++ b/examples/Demo/Source/MainWindow.cpp
@@ -368,19 +368,19 @@ private:
             case MainAppWindow::useLookAndFeelV1:
                 result.setInfo ("Use LookAndFeel_V1", String::empty, generalCategory, 0);
                 result.addDefaultKeypress ('i', ModifierKeys::commandModifier);
-                result.setTicked (typeid (LookAndFeel_V1) == typeid (getLookAndFeel()));
+                result.setTicked (isLookAndFeelSelected<LookAndFeel_V1>());
                 break;
 
             case MainAppWindow::useLookAndFeelV2:
                 result.setInfo ("Use LookAndFeel_V2", String::empty, generalCategory, 0);
                 result.addDefaultKeypress ('o', ModifierKeys::commandModifier);
-                result.setTicked (typeid (LookAndFeel_V2) == typeid (getLookAndFeel()));
+                result.setTicked (isLookAndFeelSelected<LookAndFeel_V2>());
                 break;
 
             case MainAppWindow::useLookAndFeelV3:
                 result.setInfo ("Use LookAndFeel_V3", String::empty, generalCategory, 0);
                 result.addDefaultKeypress ('p', ModifierKeys::commandModifier);
-                result.setTicked (typeid (LookAndFeel_V3) == typeid (getLookAndFeel()));
+                result.setTicked (isLookAndFeelSelected<LookAndFeel_V3>());
                 break;
 
             case MainAppWindow::toggleRepaintDebugging:
@@ -478,6 +478,13 @@ private:
 
         return true;
     }
+
+    template <typename LookAndFeelType>
+    bool isLookAndFeelSelected()
+    {
+        LookAndFeel& lf = getLookAndFeel();
+        return typeid (LookAndFeelType) == typeid (lf);
+    }
 };
 
 //==============================================================================