diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-29 13:55:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-29 13:55:08 +0100 |
| commit | b0b9c66a7fa1a664918c1cddf97d3652ab2837fc (patch) | |
| tree | 3fe368fbbe3c1e5cb6c449799757f9a77184e5c9 | |
| parent | 3125a4fb907214cf704916e2901bf732fe4999b5 (diff) | |
| parent | e15a2ff1dbfbf86b8154a8ab3eda69367183d436 (diff) | |
| download | redot-engine-b0b9c66a7fa1a664918c1cddf97d3652ab2837fc.tar.gz | |
Merge pull request #88987 from bruvzg/macos_12_depr_warn
[macOS] Fix some deprecation warnings.
| -rw-r--r-- | platform/macos/display_server_macos.mm | 2 | ||||
| -rw-r--r-- | platform/macos/godot_application.mm | 2 | ||||
| -rw-r--r-- | platform/macos/os_macos.mm | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index d2e4179987..2d6e614a05 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -2685,7 +2685,7 @@ Ref<Image> DisplayServerMacOS::clipboard_get_image() const { return image; } NSBitmapImageRep *bitmap = [NSBitmapImageRep imageRepWithData:data]; - NSData *pngData = [bitmap representationUsingType:NSPNGFileType properties:@{}]; + NSData *pngData = [bitmap representationUsingType:NSBitmapImageFileTypePNG properties:@{}]; image.instantiate(); PNGDriverCommon::png_to_image((const uint8_t *)pngData.bytes, pngData.length, false, image); return image; diff --git a/platform/macos/godot_application.mm b/platform/macos/godot_application.mm index e3a744caa2..f5e1bb43bf 100644 --- a/platform/macos/godot_application.mm +++ b/platform/macos/godot_application.mm @@ -100,7 +100,7 @@ } - (void)sendEvent:(NSEvent *)event { - if ([event type] == NSSystemDefined && [event subtype] == 8) { + if ([event type] == NSEventTypeSystemDefined && [event subtype] == 8) { int keyCode = (([event data1] & 0xFFFF0000) >> 16); int keyFlags = ([event data1] & 0x0000FFFF); int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA; diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index 29f433a51c..c5c95c9a70 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -601,7 +601,9 @@ Error OS_MacOS::create_process(const String &p_path, const List<String> &p_argum for (const String &arg : p_arguments) { [arguments addObject:[NSString stringWithUTF8String:arg.utf8().get_data()]]; } +#if defined(__x86_64__) if (@available(macOS 10.15, *)) { +#endif NSWorkspaceOpenConfiguration *configuration = [[NSWorkspaceOpenConfiguration alloc] init]; [configuration setArguments:arguments]; [configuration setCreatesNewApplicationInstance:YES]; @@ -630,6 +632,7 @@ Error OS_MacOS::create_process(const String &p_path, const List<String> &p_argum } return err; +#if defined(__x86_64__) } else { Error err = ERR_TIMEOUT; NSError *error = nullptr; @@ -645,6 +648,7 @@ Error OS_MacOS::create_process(const String &p_path, const List<String> &p_argum } return err; } +#endif } else { return OS_Unix::create_process(p_path, p_arguments, r_child_id, p_open_console); } |