Merge branch 'master' of git://factorcode.org/git/factor

db4
Daniel Ehrenberg 2009-03-18 21:04:53 -05:00
commit 4f1ef75066
2 changed files with 5 additions and 4 deletions

View File

@ -26,7 +26,7 @@ os macosx? [
[ t ] [ "webkit-demo" shake-and-bake 500000 small-enough? ] unit-test [ t ] [ "webkit-demo" shake-and-bake 500000 small-enough? ] unit-test
] when ] when
[ t ] [ "benchmark.regex-dna" shake-and-bake 1200000 small-enough? ] unit-test [ t ] [ "benchmark.regex-dna" shake-and-bake 900000 small-enough? ] unit-test
{ {
"tools.deploy.test.1" "tools.deploy.test.1"

View File

@ -1,17 +1,18 @@
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008, 2009 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel USING: kernel
cocoa cocoa
cocoa.application cocoa.application
cocoa.types cocoa.types
cocoa.classes cocoa.classes
cocoa.windows ; cocoa.windows
core-graphics.types ;
IN: webkit-demo IN: webkit-demo
FRAMEWORK: /System/Library/Frameworks/WebKit.framework FRAMEWORK: /System/Library/Frameworks/WebKit.framework
IMPORT: WebView IMPORT: WebView
: rect ( -- rect ) 0 0 700 500 <NSRect> ; : rect ( -- rect ) 0 0 700 500 <CGRect> ;
: <WebView> ( -- id ) : <WebView> ( -- id )
WebView -> alloc WebView -> alloc