src/juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp

@@ -45,29 +45,33 @@
 
 namespace FlacNamespace
 {
-#define FLAC__NO_DLL 1
+#if JUCE_INCLUDE_FLAC_CODE
+ #define FLAC__NO_DLL 1
 
-#if ! defined (SIZE_MAX)
+ #if ! defined (SIZE_MAX)
   #define SIZE_MAX 0xffffffff
-#endif
+ #endif
 
-#define __STDC_LIMIT_MACROS 1
-#include "flac/all.h"
-#include "flac/libFLAC/bitmath.c"
-#include "flac/libFLAC/bitreader.c"
-#include "flac/libFLAC/bitwriter.c"
-#include "flac/libFLAC/cpu.c"
-#include "flac/libFLAC/crc.c"
-#include "flac/libFLAC/fixed.c"
-#include "flac/libFLAC/float.c"
-#include "flac/libFLAC/format.c"
-#include "flac/libFLAC/lpc_flac.c"
-#include "flac/libFLAC/md5.c"
-#include "flac/libFLAC/memory.c"
-#include "flac/libFLAC/stream_decoder.c"
-#include "flac/libFLAC/stream_encoder.c"
-#include "flac/libFLAC/stream_encoder_framing.c"
-#include "flac/libFLAC/window_flac.c"
+ #define __STDC_LIMIT_MACROS 1
+ #include "flac/all.h"
+ #include "flac/libFLAC/bitmath.c"
+ #include "flac/libFLAC/bitreader.c"
+ #include "flac/libFLAC/bitwriter.c"
+ #include "flac/libFLAC/cpu.c"
+ #include "flac/libFLAC/crc.c"
+ #include "flac/libFLAC/fixed.c"
+ #include "flac/libFLAC/float.c"
+ #include "flac/libFLAC/format.c"
+ #include "flac/libFLAC/lpc_flac.c"
+ #include "flac/libFLAC/md5.c"
+ #include "flac/libFLAC/memory.c"
+ #include "flac/libFLAC/stream_decoder.c"
+ #include "flac/libFLAC/stream_encoder.c"
+ #include "flac/libFLAC/stream_encoder_framing.c"
+ #include "flac/libFLAC/window_flac.c"
+#else
+ #include <FLAC/all.h>
+#endif
 }
 
 #ifdef _MSC_VER

src/juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp

@@ -42,33 +42,39 @@
 
 namespace OggVorbisNamespace
 {
-#include "oggvorbis/vorbisenc.h"
-#include "oggvorbis/codec.h"
-#include "oggvorbis/vorbisfile.h"
+#if JUCE_INCLUDE_OGGVORBIS_CODE
+ #include "oggvorbis/vorbisenc.h"
+ #include "oggvorbis/codec.h"
+ #include "oggvorbis/vorbisfile.h"
 
-#include "oggvorbis/bitwise.c"
-#include "oggvorbis/framing.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/analysis.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/bitrate.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/block.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/codebook.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/envelope.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/floor0.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/floor1.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/info.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/lpc.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/lsp.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/mapping0.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/mdct.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/psy.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/registry.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/res0.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/sharedbook.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/smallft.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/synthesis.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/vorbisenc.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c"
-#include "oggvorbis/libvorbis-1.1.2/lib/window.c"
+ #include "oggvorbis/bitwise.c"
+ #include "oggvorbis/framing.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/analysis.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/bitrate.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/block.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/codebook.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/envelope.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/floor0.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/floor1.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/info.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/lpc.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/lsp.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/mapping0.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/mdct.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/psy.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/registry.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/res0.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/sharedbook.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/smallft.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/synthesis.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/vorbisenc.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c"
+ #include "oggvorbis/libvorbis-1.1.2/lib/window.c"
+#else
+ #include <vorbis/vorbisenc.h>
+ #include <vorbis/codec.h>
+ #include <vorbis/vorbisfile.h>
+#endif
 }
 
 BEGIN_JUCE_NAMESPACE

src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp

@@ -375,9 +375,10 @@ void ComponentPeer::handleMessage (const Message& message)
 {
     if (message.intParameter1 == fakeMouseMoveMessage)
     {
-        handleMouseMove (message.intParameter2,
-                         message.intParameter3,
-                         Time::currentTimeMillis());
+        if (! ModifierKeys::getCurrentModifiers().isAnyMouseButtonDown())
+            handleMouseMove (message.intParameter2,
+                             message.intParameter3,
+                             Time::currentTimeMillis());
     }
 }
 

src/juce_appframework/gui/graphics/drawables/juce_SVGParser.cpp

@@ -1137,7 +1137,7 @@ private:
                 tokens.trim();
                 tokens.removeEmptyStrings();
 
-                if (tokens[0].containsChar T('%'))
+                if (tokens[0].containsChar (T('%')))
                     return Colour ((uint8) roundDoubleToInt (2.55 * tokens[0].getDoubleValue()),
                                    (uint8) roundDoubleToInt (2.55 * tokens[1].getDoubleValue()),
                                    (uint8) roundDoubleToInt (2.55 * tokens[2].getDoubleValue()));

src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp

@@ -38,6 +38,7 @@
 
 namespace zlibNamespace
 {
+#if JUCE_INCLUDE_ZLIB_CODE
   extern "C"
   {
     #undef OS_CODE
@@ -68,6 +69,9 @@ namespace zlibNamespace
     #include "zlib/zutil.c"
     #undef Byte
   }
+#else
+  #include <zlib.h>
+#endif
 }
 
 #if JUCE_MSVC