Merge branch 'master' of github.com:280north/cappuccino

AppKit/CPResponder.j

@@ -231,11 +231,18 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*
-    FIXME This description is bad.
-    Based on \c anEvent, the receiver should simulate the event.
-    @param anEvent the event to simulate
-    @return \c YES if the event receiver simulated the  event
+/*!
+    Overridden by subclasses to handle a key equivalent.
+
+    If the character code or codes in \c anEvent match the receiver’s key equivalent,
+    the receiver should respond to the event and return \c YES. The default implementation
+    does nothing and returns \c NO.
+
+    You should extract the characters for a key equivalent using
+    \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]".
+
+    @param anEvent An event object that represents the key equivalent pressed
+    @return \c YES if theEvent is a key equivalent that the receiver handled, \c NO if it is not a key equivalent that it should handle.
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {

AppKit/CPView.j

@@ -2129,6 +2129,20 @@ setBoundsOrigin:
 
 @implementation CPView (KeyView)
 
+/*!
+    Overridden by subclasses to handle a key equivalent.
+
+    If the receiver’s key equivalent is the same as the characters of the key-down event theEvent,
+    as returned by \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]",
+    the receiver should take the appropriate action and return \c YES. Otherwise, it should return
+    the result of invoking super’s implementation. The default implementation of this method simply
+    passes the message down the view hierarchy (from superviews to subviews)
+    and returns \c NO if none of the receiver’s subviews responds \c YES.
+
+    @param anEvent An event object that represents the key equivalent pressed
+    @return \c YES if theEvent is a key equivalent that the receiver handled,
+            \c NO if it is not a key equivalent that it should handle.
+*/
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
     var count = [_subviews count];

Tools/NativeHost/Jakefile

@@ -11,7 +11,7 @@ task ("build", function()
     {
         var args = "-alltargets -configuration Release";
 
-        if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
+        if (xcodebuildHasTenPointFiveSDK())
             args = "-sdk macosx10.5 " + args;
 
         else

Tools/fontinfo/Jakefile

@@ -10,7 +10,7 @@ task ("build", function()
     {
         var args = "-alltargets -configuration " + $CONFIGURATION;
 
-        if (FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk")))
+        if (xcodebuildHasTenPointFiveSDK())
             args = "-sdk macosx10.5 " + args;
 
         else

common.jake

@@ -456,6 +456,19 @@ global.copyManPage = function(/*String*/ name, /*int*/ section)
     }
 }
 
+global.xcodebuildCanListSDKs = function ()
+{
+    return OS.system("xcodebuild -showsdks > /dev/null 2>&1") == 0;
+}
+
+global.xcodebuildHasTenPointFiveSDK = function ()
+{
+    if (xcodebuildCanListSDKs())
+        return OS.system("xcodebuild -showsdks | grep 'macosx10.5' > /dev/null 2>&1") == 0;
+
+    return FILE.exists(FILE.join("/", "Developer", "SDKs", "MacOSX10.5.sdk"));
+}
+
 
 // built in tasks