From fa48c9f1f5da645e410c3c894cefd6ee9d424c9b Mon Sep 17 00:00:00 2001 From: slava Date: Mon, 29 May 2006 00:28:26 +0000 Subject: [PATCH] Small factoring --- library/ui/cocoa/application-utils.factor | 3 +++ library/ui/cocoa/ui.factor | 3 +-- library/ui/cocoa/window-utils.factor | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/ui/cocoa/application-utils.factor b/library/ui/cocoa/application-utils.factor index 5a642860df..c3ee2c3612 100644 --- a/library/ui/cocoa/application-utils.factor +++ b/library/ui/cocoa/application-utils.factor @@ -50,6 +50,9 @@ threads ; : finish-launching ( -- ) NSApp [finishLaunching] ; +: install-delegate ( receiver delegate -- ) + [alloc] [init] [setDelegate:] ; + IN: errors : objc-error. ( error -- ) diff --git a/library/ui/cocoa/ui.factor b/library/ui/cocoa/ui.factor index c712d5c90a..2108a74fa7 100644 --- a/library/ui/cocoa/ui.factor +++ b/library/ui/cocoa/ui.factor @@ -22,8 +22,7 @@ objc-NSObject objc-NSWindow sequences ; } { } define-objc-class : install-app-delegate ( -- ) - NSApp - FactorApplicationDelegate [alloc] [init] [setDelegate:] ; + NSApp FactorApplicationDelegate install-delegate ; : init-cocoa-ui ( -- ) reset-callbacks diff --git a/library/ui/cocoa/window-utils.factor b/library/ui/cocoa/window-utils.factor index 513b85fd4a..9a29d71011 100644 --- a/library/ui/cocoa/window-utils.factor +++ b/library/ui/cocoa/window-utils.factor @@ -78,4 +78,4 @@ sequences ; } { } define-objc-class : install-window-delegate ( window -- ) - FactorWindowDelegate [alloc] [init] [setDelegate:] ; + FactorWindowDelegate install-delegate ;