Changeset 5864

Timestamp:

Feb 2, 2007, 1:31:20 AM (18 years ago)

Author:

Gary Byers

Message:

Change the initialization code a bit.

Location:

trunk/ccl/examples

Files:

• addressbook.lisp (modified) (2 diffs)
• webkit.lisp (modified) (2 diffs)

trunk/ccl/examples/addressbook.lisp

@@ -17 +17 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (require "OBJC-SUPPORT")
-  (use-interface-dir :addressbook)
-  (reset-objc-class-count)
-  (update-objc-method-info))
+  (augment-objc-interfaces :addressbook))
 
 (let* ((checked-for-addressbook nil)
@@ -28 +26 @@
   (defun check-for-addressbook ()
     (if checked-for-addressbook
-        addressbook-loaded
-        (with-autorelease-pool
-         (let* ((bundle
-                 (send
-                  (@class "NSBundle")
-                  :bundle-with-path
-                  #@"/System/Library/Frameworks/Addressbook.framework")))
-           (setq checked-for-addressbook t
-                 addressbook-loaded (unless (%null-ptr-p bundle)
-                                 (send (the ns:ns-bundle bundle) 'load)))
-           ;; Process class, method decls
-           (map-objc-classes)
-           addressbook-loaded)))))
+      addressbook-loaded
+      (setq checked-for-addressbook t
+            addressbook-loaded (load-objc-extension-framework "AddressBook")))))
 
 (defun require-addressbook () 
   (or (check-for-addressbook)
-      (error "The Addressbook framework doesn't seem to be installed on this machine.~&
-              It's available as part of Safari 1.0.")))
+      (error "The AddressBook framework doesn't seem to be installed on this machine.")))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

trunk/ccl/examples/webkit.lisp

@@ +1 @@
+
 ;;;-*-Mode: LISP; Package: CCL -*-
 
@@ -23 +24 @@
     (if checked-for-webkit
       webkit-loaded
-      (load-objc-extension-framework "WebKit"))))
+      (setq checked-for-webkit t
+            webkit-loaded (load-objc-extension-framework "WebKit")))))
 
 (defun require-webkit ()