Direct2D: Split declaration and definition of Direct2DGraphicsContext::Pimpl

examples/DemoRunner/Builds/Android/app/CMakeLists.txt

@@ -1982,6 +1982,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
@@ -4637,6 +4638,7 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"

examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj

@@ -2406,6 +2406,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters

@@ -3184,6 +3184,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj

@@ -2406,6 +2406,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

examples/DemoRunner/Builds/VisualStudio2022/DemoRunner_App.vcxproj.filters

@@ -3184,6 +3184,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt

@@ -1744,6 +1744,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
@@ -4013,6 +4014,7 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"

extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj

@@ -2097,6 +2097,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/AudioPerformanceTest/Builds/VisualStudio2022/AudioPerformanceTest_App.vcxproj.filters

@@ -2692,6 +2692,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt

@@ -1874,6 +1874,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
@@ -4296,6 +4297,7 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"

extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj

@@ -2231,6 +2231,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters

@@ -2899,6 +2899,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj

@@ -2231,6 +2231,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/AudioPluginHost/Builds/VisualStudio2022/AudioPluginHost_App.vcxproj.filters

@@ -2899,6 +2899,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt

@@ -1763,6 +1763,7 @@ add_library( ${BINARY_NAME}
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"
@@ -4112,6 +4113,7 @@ set_source_files_properties(
     "../../../../../modules/juce_graphics/native/juce_CoreGraphicsHelpers_mac.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.h"
+    "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.cpp"
     "../../../../../modules/juce_graphics/native/juce_Direct2DImage_windows.h"

extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj

@@ -2118,6 +2118,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/NetworkGraphicsDemo/Builds/VisualStudio2022/NetworkGraphicsDemo_App.vcxproj.filters

@@ -2746,6 +2746,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj

@@ -1260,6 +1260,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/Projucer/Builds/VisualStudio2019/Projucer_App.vcxproj.filters

@@ -1585,6 +1585,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj

@@ -1260,6 +1260,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/Projucer/Builds/VisualStudio2022/Projucer_App.vcxproj.filters

@@ -1585,6 +1585,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj

@@ -2239,6 +2239,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters

@@ -2947,6 +2947,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj

@@ -2239,6 +2239,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/UnitTestRunner/Builds/VisualStudio2022/UnitTestRunner_ConsoleApp.vcxproj.filters

@@ -2947,6 +2947,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj

@@ -2117,6 +2117,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>

extras/WindowsDLL/Builds/VisualStudio2022/WindowsDLL_DynamicLibrary.vcxproj.filters

@@ -2743,6 +2743,9 @@
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContext_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DGraphicsContextImpl_windows.cpp">
+      <Filter>JUCE Modules\juce_graphics\native</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_graphics\native\juce_Direct2DImage_windows.cpp">
       <Filter>JUCE Modules\juce_graphics\native</Filter>
     </ClCompile>

modules/juce_graphics/juce_graphics.cpp

@@ -231,6 +231,7 @@ extern "C"
  #include "native/juce_DirectX_windows.cpp"
  #include "native/juce_DirectWriteTypeface_windows.cpp"
  #include "native/juce_IconHelpers_windows.cpp"
+ #include "native/juce_Direct2DGraphicsContextImpl_windows.cpp"
  #include "native/juce_Direct2DGraphicsContext_windows.cpp"
  #include "native/juce_Direct2DImageContext_windows.cpp"
  #include "native/juce_Direct2DImage_windows.cpp"

modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.cpp

@@ -0,0 +1,290 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE framework.
+   Copyright (c) Raw Material Software Limited
+
+   JUCE is an open source framework subject to commercial or open source
+   licensing.
+
+   By downloading, installing, or using the JUCE framework, or combining the
+   JUCE framework with any other source code, object code, content or any other
+   copyrightable work, you agree to the terms of the JUCE End User Licence
+   Agreement, and all incorporated terms including the JUCE Privacy Policy and
+   the JUCE Website Terms of Service, as applicable, which will bind you. If you
+   do not agree to the terms of these agreements, we will not license the JUCE
+   framework to you, and you must discontinue the installation or download
+   process and cease use of the JUCE framework.
+
+   JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
+   JUCE Privacy Policy: https://juce.com/juce-privacy-policy
+   JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
+
+   Or:
+
+   You may also use this code under the terms of the AGPLv3:
+   https://www.gnu.org/licenses/agpl-3.0.en.html
+
+   THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
+   WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
+
+  ==============================================================================
+*/
+
+namespace juce
+{
+
+bool Direct2DGraphicsContext::Pimpl::prepare()
+{
+    if (! deviceResources.has_value())
+        deviceResources = Direct2DDeviceResources::create (getDeviceContext());
+
+    return deviceResources.has_value();
+}
+
+void Direct2DGraphicsContext::Pimpl::teardown()
+{
+    deviceResources.reset();
+}
+
+bool Direct2DGraphicsContext::Pimpl::checkPaintReady()
+{
+    return deviceResources.has_value();
+}
+
+Direct2DGraphicsContext::Pimpl::Pimpl (Direct2DGraphicsContext& ownerIn)
+    : owner (ownerIn)
+{
+    directX->adapters.addListener (*this);
+}
+
+Direct2DGraphicsContext::Pimpl::~Pimpl()
+{
+    directX->adapters.removeListener (*this);
+
+    popAllSavedStates();
+}
+
+auto Direct2DGraphicsContext::Pimpl::startFrame() -> SavedState*
+{
+    prepare();
+
+    // Anything to paint?
+    const auto paintAreas = getPaintAreas();
+    const auto paintBounds = paintAreas.getBounds();
+
+    if (! getFrameSize().intersects (paintBounds) || paintBounds.isEmpty() || paintAreas.isEmpty())
+        return nullptr;
+
+    // Is Direct2D ready to paint?
+    if (! checkPaintReady())
+        return nullptr;
+
+   #if JUCE_DIRECT2D_METRICS
+    owner.metrics->startFrame();
+   #endif
+
+    JUCE_TRACE_EVENT_INT_RECT_LIST (etw::startD2DFrame, etw::direct2dKeyword, owner.getFrameId(), paintAreas);
+
+    const auto deviceContext = getDeviceContext();
+
+    // Init device context transform
+    resetTransform (deviceContext);
+
+    // Start drawing
+    deviceContext->SetTarget (getDeviceContextTarget());
+    deviceContext->BeginDraw();
+
+    // Init the save state stack and return the first saved state
+    return pushFirstSavedState (paintBounds);
+}
+
+HRESULT Direct2DGraphicsContext::Pimpl::finishFrame()
+{
+    // Fully pop the state stack
+    popAllSavedStates();
+
+    // Finish drawing
+    // SetTarget(nullptr) so the device context doesn't hold a reference to the swap chain buffer
+    HRESULT hr = S_OK;
+    {
+        JUCE_D2DMETRICS_SCOPED_ELAPSED_TIME (owner.metrics, endDrawDuration)
+        JUCE_SCOPED_TRACE_EVENT_FRAME (etw::endDraw, etw::direct2dKeyword, owner.getFrameId());
+
+        const auto deviceContext = getDeviceContext();
+        hr = deviceContext->EndDraw();
+        deviceContext->SetTarget (nullptr);
+    }
+
+    jassert (SUCCEEDED (hr));
+
+    if (FAILED (hr))
+        teardown();
+
+   #if JUCE_DIRECT2D_METRICS
+    owner.metrics->finishFrame();
+   #endif
+
+    return hr;
+}
+
+auto Direct2DGraphicsContext::Pimpl::getCurrentSavedState() const -> SavedState*
+{
+    return ! savedClientStates.empty() ? savedClientStates.back().get() : nullptr;
+}
+
+auto Direct2DGraphicsContext::Pimpl::pushFirstSavedState (Rectangle<int> initialClipRegion) -> SavedState*
+{
+    jassert (savedClientStates.empty());
+
+    savedClientStates.push_back (std::make_unique<SavedState> (owner,
+                                                               initialClipRegion,
+                                                               getDeviceContext(),
+                                                               deviceResources->colourBrush,
+                                                               *deviceResources));
+
+    return getCurrentSavedState();
+}
+
+auto Direct2DGraphicsContext::Pimpl::pushSavedState() -> SavedState*
+{
+    jassert (! savedClientStates.empty());
+
+    savedClientStates.push_back (std::make_unique<SavedState> (*savedClientStates.back()));
+
+    return getCurrentSavedState();
+}
+
+auto Direct2DGraphicsContext::Pimpl::popSavedState() -> SavedState*
+{
+    savedClientStates.back()->popLayers();
+    savedClientStates.pop_back();
+
+    return getCurrentSavedState();
+}
+
+void Direct2DGraphicsContext::Pimpl::popAllSavedStates()
+{
+    while (! savedClientStates.empty())
+        popSavedState();
+}
+
+void Direct2DGraphicsContext::Pimpl::setDeviceContextTransform (AffineTransform transform)
+{
+    setTransform (getDeviceContext(), transform);
+}
+
+void Direct2DGraphicsContext::Pimpl::resetDeviceContextTransform()
+{
+    resetTransform (getDeviceContext());
+}
+
+bool Direct2DGraphicsContext::Pimpl::fillSpriteBatch (const RectangleList<float>& list)
+{
+    if (! owner.currentState->fillType.isColour())
+        return false;
+
+    auto* rectangleListSpriteBatch = deviceResources->rectangleListSpriteBatch.get();
+
+    if (rectangleListSpriteBatch == nullptr)
+        return false;
+
+    const auto deviceContext = getDeviceContext();
+
+    if (deviceContext == nullptr)
+        return false;
+
+    owner.applyPendingClipList();
+
+    const auto& transform = owner.currentState->currentTransform;
+
+    if (transform.isOnlyTranslated)
+    {
+        auto translateRectangle = [&] (const Rectangle<float>& r) -> Rectangle<float>
+        {
+            return transform.translated (r);
+        };
+
+        return rectangleListSpriteBatch->fillRectangles (deviceContext,
+                                                         list,
+                                                         owner.currentState->fillType.colour,
+                                                         translateRectangle,
+                                                         owner.metrics.get());
+    }
+
+    if (owner.currentState->isCurrentTransformAxisAligned())
+    {
+        auto transformRectangle = [&] (const Rectangle<float>& r) -> Rectangle<float>
+        {
+            return transform.boundsAfterTransform (r);
+        };
+
+        return rectangleListSpriteBatch->fillRectangles (deviceContext,
+                                                         list,
+                                                         owner.currentState->fillType.colour,
+                                                         transformRectangle,
+                                                         owner.metrics.get());
+    }
+
+    auto checkRectangleWithoutTransforming = [&] (const Rectangle<float>& r) -> Rectangle<float>
+    {
+        return r;
+    };
+
+    ScopedTransform scopedTransform { *this, owner.currentState };
+    return rectangleListSpriteBatch->fillRectangles (deviceContext,
+                                                     list,
+                                                     owner.currentState->fillType.colour,
+                                                     checkRectangleWithoutTransforming,
+                                                     owner.metrics.get());
+}
+
+Line<float> Direct2DGraphicsContext::Pimpl::offsetShape (Line<float> a, Point<float> b)
+{
+    return Line<float> { a.getStart() + b, a.getEnd() + b };
+}
+
+Rectangle<float> Direct2DGraphicsContext::Pimpl::offsetShape (Rectangle<float> a, Point<float> b)
+{
+    return a + b;
+}
+
+RectangleList<float> Direct2DGraphicsContext::Pimpl::offsetShape (RectangleList<float> a, Point<float> b)
+{
+    a.offsetAll (b);
+    return a;
+}
+
+void Direct2DGraphicsContext::Pimpl::resetTransform (ID2D1DeviceContext1* context)
+{
+    context->SetTransform (D2D1::IdentityMatrix());
+}
+
+void Direct2DGraphicsContext::Pimpl::setTransform (ID2D1DeviceContext1* context, AffineTransform newTransform)
+{
+    context->SetTransform (D2DUtilities::transformToMatrix (newTransform));
+}
+
+DxgiAdapter::Ptr Direct2DGraphicsContext::Pimpl::findAdapter() const
+{
+    return Direct2DDeviceResources::findAdapter (directX->adapters, getDeviceContext());
+}
+
+void Direct2DGraphicsContext::Pimpl::adapterCreated (DxgiAdapter::Ptr newAdapter)
+{
+    const auto adapter = findAdapter();
+
+    if (adapter == nullptr || ! adapter->uniqueIDMatches (newAdapter))
+        teardown();
+}
+
+void Direct2DGraphicsContext::Pimpl::adapterRemoved (DxgiAdapter::Ptr expiringAdapter)
+{
+    const auto adapter = findAdapter();
+
+    if (adapter != nullptr && adapter->uniqueIDMatches (expiringAdapter))
+        teardown();
+}
+
+} // namespace juce

modules/juce_graphics/native/juce_Direct2DGraphicsContextImpl_windows.h

@@ -566,156 +566,32 @@ protected:
 
     std::vector<std::unique_ptr<Direct2DGraphicsContext::SavedState>> savedClientStates;
 
-    virtual bool prepare()
+    virtual bool prepare();
-    {
+    virtual void teardown();
-        if (! deviceResources.has_value())
+    virtual bool checkPaintReady();
-            deviceResources = Direct2DDeviceResources::create (getDeviceContext());
-
-        return deviceResources.has_value();
-    }
-
-    virtual void teardown()
-    {
-        deviceResources.reset();
-    }
-
-    virtual bool checkPaintReady()
-    {
-        return deviceResources.has_value();
-    }
 
 public:
-    explicit Pimpl (Direct2DGraphicsContext& ownerIn)
+    explicit Pimpl (Direct2DGraphicsContext& ownerIn);
-        : owner (ownerIn)
+    ~Pimpl() override;
-    {
-        directX->adapters.addListener (*this);
-    }
 
-    ~Pimpl() override
+    virtual SavedState* startFrame();
-    {
+    virtual HRESULT finishFrame();
-        directX->adapters.removeListener (*this);
 
-        popAllSavedStates();
+    SavedState* getCurrentSavedState() const;
-    }
+    SavedState* pushFirstSavedState (Rectangle<int> initialClipRegion);
 
-    virtual SavedState* startFrame()
+    SavedState* pushSavedState();
-    {
+    SavedState* popSavedState();
-        prepare();
 
-        // Anything to paint?
+    void popAllSavedStates();
-        const auto paintAreas = getPaintAreas();
-        const auto paintBounds = paintAreas.getBounds();
-
-        if (! getFrameSize().intersects (paintBounds) || paintBounds.isEmpty() || paintAreas.isEmpty())
-            return nullptr;
-
-        // Is Direct2D ready to paint?
-        if (! checkPaintReady())
-            return nullptr;
-
-       #if JUCE_DIRECT2D_METRICS
-        owner.metrics->startFrame();
-       #endif
-
-        JUCE_TRACE_EVENT_INT_RECT_LIST (etw::startD2DFrame, etw::direct2dKeyword, owner.getFrameId(), paintAreas);
-
-        const auto deviceContext = getDeviceContext();
-
-        // Init device context transform
-        resetTransform (deviceContext);
-
-        // Start drawing
-        deviceContext->SetTarget (getDeviceContextTarget());
-        deviceContext->BeginDraw();
-
-        // Init the save state stack and return the first saved state
-        return pushFirstSavedState (paintBounds);
-    }
-
-    virtual HRESULT finishFrame()
-    {
-        // Fully pop the state stack
-        popAllSavedStates();
-
-        // Finish drawing
-        // SetTarget(nullptr) so the device context doesn't hold a reference to the swap chain buffer
-        HRESULT hr = S_OK;
-        {
-            JUCE_D2DMETRICS_SCOPED_ELAPSED_TIME (owner.metrics, endDrawDuration)
-            JUCE_SCOPED_TRACE_EVENT_FRAME (etw::endDraw, etw::direct2dKeyword, owner.getFrameId());
-
-            const auto deviceContext = getDeviceContext();
-            hr = deviceContext->EndDraw();
-            deviceContext->SetTarget (nullptr);
-        }
-
-        jassert (SUCCEEDED (hr));
-
-        if (FAILED (hr))
-            teardown();
-
-       #if JUCE_DIRECT2D_METRICS
-        owner.metrics->finishFrame();
-       #endif
-
-        return hr;
-    }
-
-    SavedState* getCurrentSavedState() const
-    {
-        return ! savedClientStates.empty() ? savedClientStates.back().get() : nullptr;
-    }
-
-    SavedState* pushFirstSavedState (Rectangle<int> initialClipRegion)
-    {
-        jassert (savedClientStates.empty());
-
-        savedClientStates.push_back (std::make_unique<SavedState> (owner,
-                                                                   initialClipRegion,
-                                                                   getDeviceContext(),
-                                                                   deviceResources->colourBrush,
-                                                                   *deviceResources));
-
-        return getCurrentSavedState();
-    }
-
-    SavedState* pushSavedState()
-    {
-        jassert (! savedClientStates.empty());
-
-        savedClientStates.push_back (std::make_unique<SavedState> (*savedClientStates.back()));
-
-        return getCurrentSavedState();
-    }
-
-    SavedState* popSavedState()
-    {
-        savedClientStates.back()->popLayers();
-        savedClientStates.pop_back();
-
-        return getCurrentSavedState();
-    }
-
-    void popAllSavedStates()
-    {
-        while (! savedClientStates.empty())
-            popSavedState();
-    }
 
     virtual RectangleList<int> getPaintAreas() const = 0;
     virtual Rectangle<int> getFrameSize() const = 0;
     virtual ComSmartPtr<ID2D1DeviceContext1> getDeviceContext() const = 0;
     virtual ComSmartPtr<ID2D1Image> getDeviceContextTarget() const = 0;
 
-    void setDeviceContextTransform (AffineTransform transform)
+    void setDeviceContextTransform (AffineTransform transform);
-    {
+    void resetDeviceContextTransform();
-        setTransform (getDeviceContext(), transform);
-    }
-
-    void resetDeviceContextTransform()
-    {
-        resetTransform (getDeviceContext());
-    }
 
     auto getDirect2DFactory()
     {
@@ -737,81 +613,11 @@ public:
         return directWrite->getFonts();
     }
 
-    bool fillSpriteBatch (const RectangleList<float>& list)
+    bool fillSpriteBatch (const RectangleList<float>& list);
-    {
-        if (! owner.currentState->fillType.isColour())
-            return false;
 
-        auto* rectangleListSpriteBatch = deviceResources->rectangleListSpriteBatch.get();
+    static Line<float> offsetShape (Line<float> a, Point<float> b);
-
+    static Rectangle<float> offsetShape (Rectangle<float> a, Point<float> b);
-        if (rectangleListSpriteBatch == nullptr)
+    static RectangleList<float> offsetShape (RectangleList<float> a, Point<float> b);
-            return false;
-
-        const auto deviceContext = getDeviceContext();
-
-        if (deviceContext == nullptr)
-            return false;
-
-        owner.applyPendingClipList();
-
-        const auto& transform = owner.currentState->currentTransform;
-
-        if (transform.isOnlyTranslated)
-        {
-            auto translateRectangle = [&] (const Rectangle<float>& r) -> Rectangle<float>
-            {
-                return transform.translated (r);
-            };
-
-            return rectangleListSpriteBatch->fillRectangles (deviceContext,
-                                                             list,
-                                                             owner.currentState->fillType.colour,
-                                                             translateRectangle,
-                                                             owner.metrics.get());
-        }
-
-        if (owner.currentState->isCurrentTransformAxisAligned())
-        {
-            auto transformRectangle = [&] (const Rectangle<float>& r) -> Rectangle<float>
-            {
-                return transform.boundsAfterTransform (r);
-            };
-
-            return rectangleListSpriteBatch->fillRectangles (deviceContext,
-                                                             list,
-                                                             owner.currentState->fillType.colour,
-                                                             transformRectangle,
-                                                             owner.metrics.get());
-        }
-
-        auto checkRectangleWithoutTransforming = [&] (const Rectangle<float>& r) -> Rectangle<float>
-        {
-            return r;
-        };
-
-        ScopedTransform scopedTransform { *this, owner.currentState };
-        return rectangleListSpriteBatch->fillRectangles (deviceContext,
-                                                         list,
-                                                         owner.currentState->fillType.colour,
-                                                         checkRectangleWithoutTransforming,
-                                                         owner.metrics.get());
-    }
-
-    static Line<float> offsetShape (Line<float> a, Point<float> b)
-    {
-        return Line<float> { a.getStart() + b, a.getEnd() + b };
-    }
-
-    static Rectangle<float> offsetShape (Rectangle<float> a, Point<float> b)
-    {
-        return a + b;
-    }
-
-    static RectangleList<float> offsetShape (RectangleList<float> a, Point<float> b)
-    {
-        a.offsetAll (b);
-        return a;
-    }
 
     template <typename Shape, typename Fn>
     void paintPrimitive (const Shape& shape, Fn&& primitiveOp)
@@ -848,36 +654,13 @@ public:
     DirectWriteGlyphRun glyphRun;
 
 private:
-    static void resetTransform (ID2D1DeviceContext1* context)
+    static void resetTransform (ID2D1DeviceContext1* context);
-    {
+    static void setTransform (ID2D1DeviceContext1* context, AffineTransform newTransform);
-        context->SetTransform (D2D1::IdentityMatrix());
-    }
 
-    static void setTransform (ID2D1DeviceContext1* context, AffineTransform newTransform)
+    DxgiAdapter::Ptr findAdapter() const;
-    {
-        context->SetTransform (D2DUtilities::transformToMatrix (newTransform));
-    }
 
-    DxgiAdapter::Ptr findAdapter() const
+    void adapterCreated (DxgiAdapter::Ptr newAdapter) override;
-    {
+    void adapterRemoved (DxgiAdapter::Ptr expiringAdapter) override;
-        return Direct2DDeviceResources::findAdapter (directX->adapters, getDeviceContext());
-    }
-
-    void adapterCreated (DxgiAdapter::Ptr newAdapter) override
-    {
-        const auto adapter = findAdapter();
-
-        if (adapter == nullptr || ! adapter->uniqueIDMatches (newAdapter))
-            teardown();
-    }
-
-    void adapterRemoved (DxgiAdapter::Ptr expiringAdapter) override
-    {
-        const auto adapter = findAdapter();
-
-        if (adapter != nullptr && adapter->uniqueIDMatches (expiringAdapter))
-            teardown();
-    }
 
     HWND hwnd = nullptr;