From 24e088fc0876813225e93d25c3b42fc6d9d6727c Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 9 Sep 2025 10:23:07 +0200 Subject: [PATCH 1/2] Fix compilation warnings --- Source/Engine/Physics/Actors/IPhysicsDebug.h | 2 +- Source/Engine/Platform/Mac/MacPlatform.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Physics/Actors/IPhysicsDebug.h b/Source/Engine/Physics/Actors/IPhysicsDebug.h index cedd3d822..57e9a97e3 100644 --- a/Source/Engine/Physics/Actors/IPhysicsDebug.h +++ b/Source/Engine/Physics/Actors/IPhysicsDebug.h @@ -12,7 +12,7 @@ public: { } }; -#define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) +#define ImplementPhysicsDebug void DrawPhysicsDebug(RenderView& view) override #else #define ImplementPhysicsDebug #endif diff --git a/Source/Engine/Platform/Mac/MacPlatform.cpp b/Source/Engine/Platform/Mac/MacPlatform.cpp index 6c7fbf533..6ba001f20 100644 --- a/Source/Engine/Platform/Mac/MacPlatform.cpp +++ b/Source/Engine/Platform/Mac/MacPlatform.cpp @@ -258,7 +258,10 @@ bool MacPlatform::Init() // Get device id { - io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMasterPortDefault, "IOService:/"); +#if MAC_OS_X_VERSION_MAX_ALLOWED < 120000 +#define kIOMainPortDefault kIOMasterPortDefault +#endif + io_registry_entry_t ioRegistryRoot = IORegistryEntryFromPath(kIOMainPortDefault, "IOService:/"); CFStringRef deviceUuid = (CFStringRef)IORegistryEntryCreateCFProperty(ioRegistryRoot, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0); IOObjectRelease(ioRegistryRoot); String uuidStr = AppleUtils::ToString(deviceUuid); From 8921cf51569ef68a422c975f192952e01540c18e Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 9 Sep 2025 10:42:10 +0200 Subject: [PATCH 2/2] Add label/button text to string convertion for better debugging --- Source/Engine/UI/GUI/Common/Label.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Engine/UI/GUI/Common/Label.cs b/Source/Engine/UI/GUI/Common/Label.cs index 72d4cd188..df77acc14 100644 --- a/Source/Engine/UI/GUI/Common/Label.cs +++ b/Source/Engine/UI/GUI/Common/Label.cs @@ -344,5 +344,11 @@ namespace FlaxEngine.GUI base.PerformLayoutBeforeChildren(); } + + /// + public override string ToString() + { + return $"{GetType()}, '{ConvertedText()}'"; + } } }