mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-02 20:58:15 +00:00
Merge pull request #2310 from Lperlind/staging/ns-application-delegate-fix
Fix a few bindings in NSApplicationDelegate
This commit is contained in:
+7
-7
@@ -129,7 +129,7 @@ ApplicationDelegateTemplate :: struct {
|
|||||||
// Managing Windows
|
// Managing Windows
|
||||||
applicationWillUpdate: proc(notification: ^Notification),
|
applicationWillUpdate: proc(notification: ^Notification),
|
||||||
applicationDidUpdate: 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
|
// Managing the Dock Menu
|
||||||
applicationDockMenu: proc(sender: ^Application) -> ^Menu,
|
applicationDockMenu: proc(sender: ^Application) -> ^Menu,
|
||||||
// Localizing Keyboard Shortcuts
|
// Localizing Keyboard Shortcuts
|
||||||
@@ -140,7 +140,7 @@ ApplicationDelegateTemplate :: struct {
|
|||||||
applicationDidChangeScreenParameters: proc(notification: ^Notification),
|
applicationDidChangeScreenParameters: proc(notification: ^Notification),
|
||||||
// Continuing User Activities
|
// Continuing User Activities
|
||||||
applicationWillContinueUserActivityWithType: proc(application: ^Application, userActivityType: ^String) -> BOOL,
|
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),
|
applicationDidFailToContinueUserActivityWithTypeError: proc(application: ^Application, userActivityType: ^String, error: ^Error),
|
||||||
applicationDidUpdateUserActivity: proc(application: ^Application, userActivity: ^UserActivity),
|
applicationDidUpdateUserActivity: proc(application: ^Application, userActivity: ^UserActivity),
|
||||||
// Handling Push Notifications
|
// Handling Push Notifications
|
||||||
@@ -156,7 +156,7 @@ ApplicationDelegateTemplate :: struct {
|
|||||||
// Opening Files
|
// Opening Files
|
||||||
applicationOpenURLs: proc(application: ^Application, urls: ^Array),
|
applicationOpenURLs: proc(application: ^Application, urls: ^Array),
|
||||||
applicationOpenFile: proc(sender: ^Application, filename: ^String) -> BOOL,
|
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,
|
applicationOpenTempFile: proc(sender: ^Application, filename: ^String) -> BOOL,
|
||||||
applicationOpenFiles: proc(sender: ^Application, filenames: ^Array),
|
applicationOpenFiles: proc(sender: ^Application, filenames: ^Array),
|
||||||
applicationShouldOpenUntitledFile: proc(sender: ^Application) -> BOOL,
|
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@:@")
|
class_addMethod(class, intrinsics.objc_find_selector("applicationDidUpdate:"), auto_cast applicationDidUpdate, "v@:@")
|
||||||
}
|
}
|
||||||
if template.applicationShouldHandleReopenHasVisibleWindows != nil {
|
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)
|
del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self)
|
||||||
context = del._context
|
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")
|
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@:@@")
|
class_addMethod(class, intrinsics.objc_find_selector("application:willContinueUserActivityWithType:"), auto_cast applicationWillContinueUserActivityWithType, "B@:@@")
|
||||||
}
|
}
|
||||||
if template.applicationContinueUserActivityRestorationHandler != nil {
|
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)
|
del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self)
|
||||||
context = del._context
|
context = del._context
|
||||||
return del.applicationContinueUserActivityRestorationHandler(application, userActivity, restorationHandler)
|
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@:@@")
|
class_addMethod(class, intrinsics.objc_find_selector("application:openFile:"), auto_cast applicationOpenFile, "B@:@@")
|
||||||
}
|
}
|
||||||
if template.applicationOpenFileWithoutUI != nil {
|
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)
|
del := cast(^_ApplicationDelegateInternal)object_getIndexedIvars(self)
|
||||||
context = del._context
|
context = del._context
|
||||||
return del.applicationOpenFileWithoutUI(sender, filename)
|
return del.applicationOpenFileWithoutUI(sender, filename)
|
||||||
|
|||||||
Reference in New Issue
Block a user