Font fix. Juggled some win32 headers around to try to avoid include problems with certain SDK versions.

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      53
-#define JUCE_BUILDNUMBER        101
+#define JUCE_BUILDNUMBER        102
 
 /** Current Juce version number.
 

src/gui/graphics/fonts/juce_Font.cpp

@@ -160,7 +160,8 @@ Font::SharedFontInternal::SharedFontInternal (const float height_, const int sty
       kerning (0),
       ascent (0),
       styleFlags (styleFlags_),
-      typeface (TypefaceCache::getInstance()->getDefaultTypeface())
+      typeface ((styleFlags_ & (Font::bold | Font::italic)) == 0
+                    ? TypefaceCache::getInstance()->getDefaultTypeface() : nullptr)
 {
 }
 
@@ -171,7 +172,7 @@ Font::SharedFontInternal::SharedFontInternal (const String& typefaceName_, const
       kerning (0),
       ascent (0),
       styleFlags (styleFlags_),
-      typeface (0)
+      typeface (nullptr)
 {
 }
 

src/native/mac/juce_mac_QuickTimeMovieComponent.mm

@@ -209,7 +209,7 @@ bool QuickTimeMovieComponent::isMovieOpen() const
     return movie != nil;
 }
 
-const File QuickTimeMovieComponent::getCurrentMovieFile() const
+File QuickTimeMovieComponent::getCurrentMovieFile() const
 {
     return movieFile;
 }

src/native/windows/juce_win32_NativeIncludes.h

@@ -127,7 +127,7 @@
 #endif
 
 //==============================================================================
-#if JUCE_USE_CAMERA && JUCE_BUILD_NATIVE
+#if (JUCE_USE_CAMERA || JUCE_DIRECTSHOW) && JUCE_BUILD_NATIVE
 
  /*  If you're using the camera classes, you'll need access to a few DirectShow headers.
 
@@ -150,6 +150,10 @@
  #include <dshowasf.h>
 #endif
 
+#if JUCE_MEDIAFOUNDATION && JUCE_BUILD_NATIVE
+ #include <evr.h>
+#endif
+
 //==============================================================================
 #if JUCE_WASAPI && JUCE_BUILD_NATIVE
  #include <MMReg.h>
@@ -183,14 +187,6 @@
  #import <QTOControl.dll>
 #endif
 
-#if JUCE_DIRECTSHOW && JUCE_BUILD_NATIVE
- #include <DShow.h>
-#endif
-
-#if JUCE_MEDIAFOUNDATION && JUCE_BUILD_NATIVE
- #include <evr.h>
-#endif
-
 //==============================================================================
 #if JUCE_MSVC
  #pragma warning (pop)

src/native/windows/juce_win32_QuickTimeMovieComponent.cpp

@@ -177,7 +177,7 @@ void QuickTimeMovieComponent::closeMovie()
     pimpl->clearHandle();
 }
 
-const File QuickTimeMovieComponent::getCurrentMovieFile() const
+File QuickTimeMovieComponent::getCurrentMovieFile() const
 {
     return movieFile;
 }