diff --git a/modules/juce_graphics/native/juce_DirectX_windows.cpp b/modules/juce_graphics/native/juce_DirectX_windows.cpp index 6d7203f78e..8961ad4333 100644 --- a/modules/juce_graphics/native/juce_DirectX_windows.cpp +++ b/modules/juce_graphics/native/juce_DirectX_windows.cpp @@ -599,7 +599,7 @@ std::optional Direct2DDeviceResources::create (ComSmart } //============================================================================== -String getLocalisedName (IDWriteLocalizedStrings* names) +static String getLocalisedName (IDWriteLocalizedStrings* names) { jassert (names != nullptr); @@ -619,7 +619,7 @@ String getLocalisedName (IDWriteLocalizedStrings* names) return static_cast (name); } -String getFontFamilyName (IDWriteFontFamily* family) +static String getFontFamilyName (IDWriteFontFamily* family) { jassert (family != nullptr); ComSmartPtr familyNames; @@ -628,7 +628,7 @@ String getFontFamilyName (IDWriteFontFamily* family) return getLocalisedName (familyNames); } -String getFontFaceName (IDWriteFont* font) +static String getFontFaceName (IDWriteFont* font) { jassert (font != nullptr); ComSmartPtr faceNames; @@ -637,6 +637,17 @@ String getFontFaceName (IDWriteFont* font) return getLocalisedName (faceNames); } +template +static StringArray stringArrayFromRange (Range&& range) +{ + StringArray result; + + for (const auto& item : range) + result.add (item); + + return result; +} + //============================================================================== AggregateFontCollection::AggregateFontCollection (ComSmartPtr baseCollection) : collections { std::move (baseCollection) } {} diff --git a/modules/juce_graphics/native/juce_DirectX_windows.h b/modules/juce_graphics/native/juce_DirectX_windows.h index 281b7c2f7a..b3828ac92c 100644 --- a/modules/juce_graphics/native/juce_DirectX_windows.h +++ b/modules/juce_graphics/native/juce_DirectX_windows.h @@ -409,21 +409,6 @@ private: }; //============================================================================== -String getLocalisedName (IDWriteLocalizedStrings* names); -String getFontFamilyName (IDWriteFontFamily* family); -String getFontFaceName (IDWriteFont* font); - -template -static StringArray stringArrayFromRange (Range&& range) -{ - StringArray result; - - for (const auto& item : range) - result.add (item); - - return result; -} - class AggregateFontCollection { public: