Skip to content

Commit 0d074ce

Browse files
committed
Fix the macos bridging errors I think
1 parent 4447d64 commit 0d074ce

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/video/cocoa/SDL_cocoavideo.m

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,16 +386,16 @@ bool Cocoa_CreateMenuBar(SDL_MenuBar *menu_bar)
386386

387387
[platform_menu->menu addItem:appMenuItem];
388388

389-
menu_bar->common.item_common.platform_data = CFBridgingRetain(platform_menu);
390-
389+
menu_bar->common.item_common.platform_data = (void*)CFBridgingRetain(platform_menu);
390+
391391
return true;
392392
}
393393

394394
bool Cocoa_CreateMenuItemAt(SDL_MenuItem *menu_item, size_t index, const char *name, Uint16 event_type)
395395
{
396396
PlatformMenuData* platform_data = [PlatformMenuData new];
397+
menu_item->common.platform_data = (void*)CFBridgingRetain(platform_data);
397398
platform_data->user_event_type = event_type;
398-
menu_item->common.platform_data = CFBridgingRetain(platform_data);
399399

400400
PlatformMenuData* parent_platform_data = (__bridge id _Nullable)(menu_item->common.parent->common.platform_data);
401401
NSString* name_ns = [NSString stringWithUTF8String:name];
@@ -477,7 +477,8 @@ bool Cocoa_DisableMenuItem(SDL_MenuItem *menu_item)
477477
bool Cocoa_DestroyMenuItem(SDL_MenuItem *menu_item)
478478
{
479479
PlatformMenuData* platform_data = CFBridgingRelease(menu_item->common.platform_data);
480-
PlatformMenuData* parent_platform_data = (__bridge id _Nullable)(menu_item->common.parent->common.platform_data);
480+
menu_item->common.platform_data = NULL;
481+
PlatformMenuData* parent_platform_data = (__bridge PlatformMenuData*)(menu_item->common.parent->common.platform_data);
481482
[parent_platform_data->menu removeItem:platform_data->menu_item];
482483
return false;
483484
}

0 commit comments

Comments
 (0)