From 9b9b98bc8f3a434be25ab23a182d58fb68fc63a2 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 17 Jun 2025 14:35:42 +0100 Subject: [PATCH] Windows: Make static data members inline --- modules/juce_gui_basics/native/juce_Windowing_windows.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp index 32d985bd0f..73f138173f 100644 --- a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp +++ b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp @@ -1984,7 +1984,7 @@ public: //============================================================================== bool dontRepaint; - static ModifierKeys modifiersAtLastCallback; + static inline ModifierKeys modifiersAtLastCallback; //============================================================================== struct FileDropTarget final : public ComBaseClassHelper @@ -2250,7 +2250,7 @@ private: bool isAccessibilityActive = false; //============================================================================== - static MultiTouchMapper currentTouches; + static inline MultiTouchMapper currentTouches; //============================================================================== class WindowClassHolder final : private DeletedAtShutdown @@ -4738,9 +4738,6 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HWNDComponentPeer) }; -MultiTouchMapper HWNDComponentPeer::currentTouches; -ModifierKeys HWNDComponentPeer::modifiersAtLastCallback; - ComponentPeer* Component::createNewPeer (int styleFlags, void* parentHWND) { return new HWNDComponentPeer { *this, styleFlags, (HWND) parentHWND, false, 1 };