|
28 | 28 | #import "imgui_impl_osx.h"
|
29 | 29 | #import <Cocoa/Cocoa.h>
|
30 | 30 | #import <Carbon/Carbon.h>
|
31 |
| -#import <GameController/GameController.h> |
32 | 31 | #import <time.h>
|
33 | 32 |
|
34 | 33 | // CHANGELOG
|
@@ -447,7 +446,7 @@ bool ImGui_ImplOSX_Init(NSView* view)
|
447 | 446 | bd->Observer = [ImGuiObserver new];
|
448 | 447 | bd->Window = view.window ?: NSApp.orderedWindows.firstObject;
|
449 | 448 | ImGuiViewport* main_viewport = ImGui::GetMainViewport();
|
450 |
| - main_viewport->PlatformHandle = main_viewport->PlatformHandleRaw = (__bridge_retained void*)bd->Window; |
| 449 | + main_viewport->PlatformHandle = main_viewport->PlatformHandleRaw = (void*)bd->Window; //fix(zig-gamedev) |
451 | 450 | ImGui_ImplOSX_UpdateMonitors();
|
452 | 451 | ImGui_ImplOSX_InitMultiViewportSupport();
|
453 | 452 |
|
@@ -883,12 +882,12 @@ static void ImGui_ImplOSX_CreateWindow(ImGuiViewport* viewport)
|
883 | 882 | data->Window = window;
|
884 | 883 | data->WindowOwned = true;
|
885 | 884 | viewport->PlatformRequestResize = false;
|
886 |
| - viewport->PlatformHandle = viewport->PlatformHandleRaw = (__bridge_retained void*)window; |
| 885 | + viewport->PlatformHandle = viewport->PlatformHandleRaw = (void*)window; // fix(zig-gamedev) |
887 | 886 | }
|
888 | 887 |
|
889 | 888 | static void ImGui_ImplOSX_DestroyWindow(ImGuiViewport* viewport)
|
890 | 889 | {
|
891 |
| - NSWindow* window = (__bridge_transfer NSWindow*)viewport->PlatformHandleRaw; |
| 890 | + NSWindow* window = (NSWindow*)viewport->PlatformHandleRaw; // fix(zig-gamedev) |
892 | 891 | window = nil;
|
893 | 892 |
|
894 | 893 | if (ImGuiViewportDataOSX* data = (ImGuiViewportDataOSX*)viewport->PlatformUserData)
|
@@ -1040,7 +1039,7 @@ static void ImGui_ImplOSX_UpdateMonitors()
|
1040 | 1039 | imgui_monitor.WorkPos = ImVec2(visibleFrame.origin.x, visibleFrame.origin.y);
|
1041 | 1040 | imgui_monitor.WorkSize = ImVec2(visibleFrame.size.width, visibleFrame.size.height);
|
1042 | 1041 | imgui_monitor.DpiScale = screen.backingScaleFactor;
|
1043 |
| - imgui_monitor.PlatformHandle = (__bridge_retained void*)screen; |
| 1042 | + imgui_monitor.PlatformHandle = (void*)screen; // fix(zig-gamedev) |
1044 | 1043 |
|
1045 | 1044 | platform_io.Monitors.push_back(imgui_monitor);
|
1046 | 1045 | }
|
|
0 commit comments