diff --git a/extras/juce demo/src/BinaryData.cpp b/extras/juce demo/src/BinaryData.cpp
index ea2472e13b..73bc33a63e 100644
--- a/extras/juce demo/src/BinaryData.cpp	
+++ b/extras/juce demo/src/BinaryData.cpp	
@@ -7974,3 +7974,4 @@ static const unsigned char temp17[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61
   111,109,109,97,110,100,77,97,110,97,103,101,114,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,87,105,100,103,101,116,
   115,68,101,109,111,32,40,99,111,109,109,97,110,100,77,97,110,97,103,101,114,41,59,13,10,125,13,10,0,0};
 const char* BinaryData::widgetsdemo_cpp = (const char*) temp17;
+
diff --git a/extras/the jucer/src/BinaryData.cpp b/extras/the jucer/src/BinaryData.cpp
index 1279f531a8..c08fddd03e 100644
--- a/extras/the jucer/src/BinaryData.cpp	
+++ b/extras/the jucer/src/BinaryData.cpp	
@@ -911,3 +911,4 @@ static const unsigned char temp4[] = {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68
   0,98,28,9,155,95,0,2,104,68,236,11,1,8,160,17,225,73,128,0,3,0,120,52,172,151,198,78,252,63,0,0,0,0,73,69,78,68,174,66,
   96,130,0,0};
 const char* BinaryData::prefs_misc_png = (const char*) temp4;
+
diff --git a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.h b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.h
index 196e4a482b..8b7caaf135 100644
--- a/src/juce_appframework/audio/devices/juce_AudioDeviceManager.h
+++ b/src/juce_appframework/audio/devices/juce_AudioDeviceManager.h
@@ -114,12 +114,12 @@ public:
         */
         String inputDeviceName;
 
-        /** The current sample rate. 
+        /** The current sample rate.
             This rate is used for both the input and output devices.
         */
         double sampleRate;
 
-        /** The buffer size, in samples. 
+        /** The buffer size, in samples.
             This buffer size is used for both the input and output devices.
         */
         int bufferSize;
@@ -131,7 +131,7 @@ public:
         BitArray inputChannels;
 
         /** If this is true, it indicates that the inputChannels array
-            should be ignored, and instead, the device's default channels 
+            should be ignored, and instead, the device's default channels
             should be used.
         */
         bool useDefaultInputChannels;
@@ -143,7 +143,7 @@ public:
         BitArray outputChannels;
 
         /** If this is true, it indicates that the outputChannels array
-            should be ignored, and instead, the device's default channels 
+            should be ignored, and instead, the device's default channels
             should be used.
         */
         bool useDefaultOutputChannels;
diff --git a/src/juce_appframework/audio/devices/juce_MidiInput.h b/src/juce_appframework/audio/devices/juce_MidiInput.h
index 86b2bc99bc..885b68d41a 100644
--- a/src/juce_appframework/audio/devices/juce_MidiInput.h
+++ b/src/juce_appframework/audio/devices/juce_MidiInput.h
@@ -148,16 +148,16 @@ public:
 
     //==============================================================================
     /** Destructor. */
-    ~MidiInput();
+    virtual ~MidiInput();
 
     /** Returns the name of this device.
     */
-    const String getName() const throw()                    { return name; }
+    virtual const String getName() const throw()                    { return name; }
 
     /** Allows you to set a custom name for the device, in case you don't like the name
         it was given when created.
     */
-    void setName (const String& newName) throw()            { name = newName; }
+    virtual void setName (const String& newName) throw()            { name = newName; }
 
     //==============================================================================
     /** Starts the device running.
@@ -168,18 +168,18 @@ public:
 
         @see stop
     */
-    void start();
+    virtual void start();
 
     /** Stops the device running.
 
         @see start
     */
-    void stop();
+    virtual void stop();
 
     //==============================================================================
     juce_UseDebuggingNewOperator
 
-private:
+protected:
     String name;
     void* internal;
 
diff --git a/src/juce_appframework/audio/devices/juce_MidiOutput.h b/src/juce_appframework/audio/devices/juce_MidiOutput.h
index acbb48de44..772b509555 100644
--- a/src/juce_appframework/audio/devices/juce_MidiOutput.h
+++ b/src/juce_appframework/audio/devices/juce_MidiOutput.h
@@ -94,26 +94,26 @@ public:
 
     //==============================================================================
     /** Destructor. */
-    ~MidiOutput();
+    virtual ~MidiOutput();
 
     /** Makes this device output a midi message.
 
         @see MidiMessage
     */
-    void sendMessageNow (const MidiMessage& message);
+    virtual void sendMessageNow (const MidiMessage& message);
 
     /** Sends a midi reset to the device. */
-    void reset();
+    virtual void reset();
 
 
     //==============================================================================
     /** Returns the current volume setting for this device.  */
-    bool getVolume (float& leftVol,
-                    float& rightVol);
+    virtual bool getVolume (float& leftVol,
+                            float& rightVol);
 
     /** Changes the overall volume for this device.  */
-    void setVolume (float leftVol,
-                    float rightVol);
+    virtual void setVolume (float leftVol,
+                            float rightVol);
 
     //==============================================================================
     /** This lets you supply a block of messages that will be sent out at some point
@@ -133,31 +133,31 @@ public:
         samplesPerSecondForBuffer value is needed to convert this sample position to a
         real time.
     */
-    void sendBlockOfMessages (const MidiBuffer& buffer,
-                              const double millisecondCounterToStartAt,
-                              double samplesPerSecondForBuffer) throw();
+    virtual void sendBlockOfMessages (const MidiBuffer& buffer,
+                                      const double millisecondCounterToStartAt,
+                                      double samplesPerSecondForBuffer) throw();
 
     /** Gets rid of any midi messages that had been added by sendBlockOfMessages().
     */
-    void clearAllPendingMessages() throw();
+    virtual void clearAllPendingMessages() throw();
 
     /** Starts up a background thread so that the device can send blocks of data.
 
         Call this to get the device ready, before using sendBlockOfMessages().
     */
-    void startBackgroundThread() throw();
+    virtual void startBackgroundThread() throw();
 
     /** Stops the background thread, and clears any pending midi events.
 
         @see startBackgroundThread
     */
-    void stopBackgroundThread() throw();
+    virtual void stopBackgroundThread() throw();
 
 
     //==============================================================================
     juce_UseDebuggingNewOperator
 
-private:
+protected:
     void* internal;
 
     struct PendingMessage