merge 3d9c3b7

AppKit/NSSearchFieldCell.m

@@ -10,6 +10,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #import <AppKit/NSButtonCell.h>
 #import <AppKit/NSMenu.h>
 #import <AppKit/NSImage.h>
+#import <AppKit/NSTextField.h>
 #import <AppKit/NSControl.h>
 #import <AppKit/NSTextField.h>
 #import <AppKit/NSRaise.h>
@@ -156,7 +157,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 -(BOOL)trackMouse:(NSEvent *)event inRect:(NSRect)frame ofView:(NSView *)view untilMouseUp:(BOOL)untilMouseUp {
    if([_cancelButtonCell trackMouse:event inRect:[self cancelButtonRectForBounds:frame] ofView:view untilMouseUp:YES]){
     [(NSControl *)view setStringValue:@""];
-    [(NSTextField *)view selectText:nil];
+
+    if ([view respondsToSelector:@selector(selectText:)])
+      [(NSTextField *)view selectText:nil];
     return YES;
    }
 

CoreData/NSXMLPersistentStore.m

@@ -8,6 +8,7 @@
 #import <CoreData/NSAtomicStoreCacheNode.h>
 #import <Foundation/NSXMLDocument.h>
 #import <Foundation/NSXMLElement.h>
+#import <Foundation/NSDate.h>
 #import <Foundation/NSDictionary.h>
 #import <CoreFoundation/CFUUID.h>
 

CoreGraphics/CGWindow.m

@@ -172,5 +172,4 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 -(void)flushCGLContext:(CGLContextObj)cglContext {
 }
 
-
 @end

Foundation/NSDate/NSDate.h

@@ -61,3 +61,7 @@ FOUNDATION_EXPORT const NSTimeInterval NSTimeIntervalSince1970;
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSCalendarDate.h>
 
+@interface NSDate(NSCalendarDateExtras)
++ (id)dateWithNaturalLanguageString:(NSString *)string;
+@end
+

Foundation/NSDate/NSDate.m

@@ -232,3 +232,11 @@ const NSTimeInterval NSTimeIntervalSince1970 = (NSTimeInterval)978307200.0;
 }
 
 @end
+
+@implementation NSDate(NSCalendarDateExtras)
+
++ (id)dateWithNaturalLanguageString:(NSString *)string {
+   NSUnimplementedMethod();
+}
+
+@end

Foundation/xml/NSXMLParser.m

@@ -12,7 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #import <Foundation/NSMutableDictionary.h>
 #import <Foundation/NSMutableArray.h>
 #import <Foundation/NSAutoreleasePool.h>
-#include <string.h>
+#import <string.h>
 
 enum {
    STATE_content,

Onyx2D/O2PDFOperators.m

@@ -645,7 +645,7 @@ void O2PDF_render_ID(O2PDFScanner *scanner,void *info) {
    O2PDFObject *filter=NULL;
    O2PDFInteger height=0;
    O2PDFBoolean imageMask=NO;
-   const char  *intent=NULL;
+   O2PDFObject *intent=NULL;
    O2PDFBoolean interpolate=NO;
    O2PDFInteger width=0;
    

QuartzCore/CARenderer.m

@@ -7,7 +7,9 @@
 #import <Onyx2D/O2Surface.h>
 
 @interface CALayer(private)
+-(void)_setContext:(CALayerContext *)context;
 -(NSNumber *)_textureId;
+-(void)_setTextureId:(NSNumber *)value;
 @end
 
 @implementation CARenderer