diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2023-01-19 11:03:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-19 11:03:21 +0000 |
| commit | d50c6d72db9c2cd62286cfaee0e00bf2bf0fde44 (patch) | |
| tree | bb20337835f9891a943de68ad3f201c884fc4e3e | |
| parent | 15c5e92d636fca599beff33eb4b502752f3debe5 (diff) | |
| parent | f040ef41cb7b32bc80a08780900002f989a42200 (diff) | |
Merge pull request #2310 from Lperlind/staging/ns-application-delegate-fix
Fix a few bindings in NSApplicationDelegate
| -rw-r--r-- | vendor/darwin/Foundation/NSApplication.odin | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vendor/darwin/Foundation/NSApplication.odin b/vendor/darwin/Foundation/NSApplication.odin index 36cf1e32b..c2d854f4c 100644 --- a/vendor/darwin/Foundation/NSApplication.odin +++ b/vendor/darwin/Foundation/NSApplication.odin @@ -129,7 +129,7 @@ ApplicationDelegateTemplate :: struct { // Managing Windows applicationWillUpdate: proc(notification: ^Notification), applicationDidUpdate: proc(notification: ^Notification), - applicationShouldHandleReopenHasVisibleWindows: proc(notification: ^Notification, flag: BOOL) -> BOOL, + applicationShouldHandleReopenHasVisibleWindows: proc(sender: ^Application, flag: BOOL) -> BOOL, // Managing the Dock Menu applicationDockMenu: proc(sender: ^Application) -> ^Menu, // Localizing Keyboard Shortcuts @@ -140,7 +140,7 @@ ApplicationDelegateTemplate :: struct { applicationDidChangeScreenParameters: proc(notification: ^Notification), // Continuing User Activities applicationWillContinueUserActivityWithType: proc(application: ^Application, userActivityType: ^String) -> BOOL, - applicationContinueUserActivityRestorationHandler: proc(application: ^Application, userActivity: ^UserActivity, restorationHandler: proc(^Array)) -> BOOL, + applicationContinueUserActivityRestorationHandler: proc(application: ^Application, userActivity: ^UserActivity, restorationHandler: ^Block) -> BOOL, applicationDidFailToContinueUserActivityWithTypeError: proc(application: ^Application, userActivityType: ^String, error: ^Error), applicationDidUpdateUserActivity: proc(application: ^Application, userActivity: ^UserActivity), // Handling Push Notifications @@ -156,7 +156,7 @@ ApplicationDelegateTemplate :: struct { // Opening Files applicationOpenURLs: proc(application: ^Application, urls: ^Array), applicationOpenFile: proc(sender: ^Application, filename: ^String) -> BOOL, - applicationOpenFileWithoutUI: proc(sender: ^Application, filename: ^String) -> BOOL, + applicationOpenFileWithoutUI: proc(sender: id, filename: ^String) -> BOOL, applicationOpenTempFile: proc(sender: ^Application, filename: ^String) -> BOOL, applicationOpenFiles: proc(sender: ^Application, filenames: ^Array), applicationShouldOpenUntitledFile: proc(sender: ^Application) -> BOOL, @@ -308,10 +308,10 @@ application_delegate_register_and_alloc :: proc(template: ApplicationDelegateTem class_addMethod(class, intrinsics.objc_find_selector("applicationDidUpdate:"), auto_cast applicationDidUpdate, "v@:@") } if template.applicationShouldHandleReopenHasVisibleWindows != nil { - applicationShouldHandleReopenHasVisibleWindows :: proc "c" (self: id, notification: ^Notification, flag: BOOL) -> BOOL { + applicationShouldHandleReopenHasVisibleWindows :: proc "c" (self: id, sender: ^Application, flag: BOOL) -> BOOL { del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self) context = del._context - return del.applicationShouldHandleReopenHasVisibleWindows(notification, flag) + return del.applicationShouldHandleReopenHasVisibleWindows(sender, flag) } class_addMethod(class, intrinsics.objc_find_selector("applicationShouldHandleReopen:hasVisibleWindows:"), auto_cast applicationShouldHandleReopenHasVisibleWindows, "B@:@B") } @@ -356,7 +356,7 @@ application_delegate_register_and_alloc :: proc(template: ApplicationDelegateTem class_addMethod(class, intrinsics.objc_find_selector("application:willContinueUserActivityWithType:"), auto_cast applicationWillContinueUserActivityWithType, "B@:@@") } if template.applicationContinueUserActivityRestorationHandler != nil { - applicationContinueUserActivityRestorationHandler :: proc "c" (self: id, application: ^Application, userActivity: ^UserActivity, restorationHandler: proc(^Array)) -> BOOL { + applicationContinueUserActivityRestorationHandler :: proc "c" (self: id, application: ^Application, userActivity: ^UserActivity, restorationHandler: ^Block) -> BOOL { del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self) context = del._context return del.applicationContinueUserActivityRestorationHandler(application, userActivity, restorationHandler) @@ -436,7 +436,7 @@ application_delegate_register_and_alloc :: proc(template: ApplicationDelegateTem class_addMethod(class, intrinsics.objc_find_selector("application:openFile:"), auto_cast applicationOpenFile, "B@:@@") } if template.applicationOpenFileWithoutUI != nil { - applicationOpenFileWithoutUI :: proc "c" (self: id, sender: ^Application, filename: ^String) -> BOOL { + applicationOpenFileWithoutUI :: proc "c" (self: id, sender: id, filename: ^String) -> BOOL { del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self) context = del._context return del.applicationOpenFileWithoutUI(sender, filename) |