darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-10-07 09:33:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge with autoxr-mike

Browse Source
This commit is contained in:
Christopher Lloyd 2010-11-01 16:10:04 -04:00
commit 8ce09ca7d4
25 changed files with 267 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.hgignore
View File

@ -5,3 +5,11 @@ syntax: glob
*.perspectivev3
*.mode2v3
build
.svn
.DS_Store
*.pyc
*.swp
*~.nib
*.orig

37
AppKit/NSAnimation/NSAnimation.m
View File

@ -146,20 +146,17 @@ NSString *NSAnimationRunLoopMode=@"NSAnimationRunLoopMode";
}
-(void)_setCurrentProgressAndEndIfNeeded:(NSAnimationProgress)progress {
if(_isAnimating){
progress=MAX(0.0,MIN(1.0,progress));
[self setCurrentProgress:progress];
if(progress>=1.0){
if([_delegate respondsToSelector:@selector(animationDidEnd:)])
[_delegate performSelector:@selector(animationDidEnd:) withObject:self];
_isAnimating=NO;
[_timer invalidate];
_timer=nil;
[self autorelease];
}
}
if(_isAnimating){
progress=MAX(0.0,MIN(1.0,progress));
[self setCurrentProgress:progress];
if(progress>=1.0){
if([_delegate respondsToSelector:@selector(animationDidEnd:)])
[_delegate performSelector:@selector(animationDidEnd:) withObject:self];
[self stopAnimation];
}
}
}
-(void)timer:(NSTimer *)timer {
@ -208,12 +205,12 @@ NSString *NSAnimationRunLoopMode=@"NSAnimationRunLoopMode";
}
-(void)stopAnimation {
if(_isAnimating){
_isAnimating=NO;
[_timer invalidate];
_timer=nil;
[self autorelease];
}
if(_isAnimating){
_isAnimating=NO;
[_timer invalidate];
_timer=nil;
[self autorelease];
}
}
-(void)startWhenAnimation:(NSAnimation *)animation reachesProgress:(NSAnimationProgress)progress {

4
AppKit/NSButton.m
View File

@ -23,10 +23,12 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
return [super resignFirstResponder];
}
#if 0
// This results in no button being drawn if there's no image.
-(BOOL)isFlipped {
return YES;
}
#endif
-(BOOL)isOpaque {
return [_cell isOpaque];
}

1
AppKit/NSClipView.m
View File

@ -179,6 +179,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(void)drawRect:(NSRect)rect {
if([_docView isOpaque]){
NSLog(@"[_docView isOpaque]");
NSRect bounds=[self bounds];
NSRect frame=[_docView frame];
NSRect intersection=NSIntersectionRect(bounds,frame);

2
AppKit/NSKeyboardBinding/StandardKeyBindings.keybindings
View File

@ -1,6 +1,6 @@
{
/* let's try this format! (Apple is using a gigantic XML database...) */
"0x0008" = "deleteBackward:"; /* <- (backspace? heh) */
"0x0008" = "deleteBackward:"; /* (backspace? heh) */
"0x001B" = "cancel:"; /* Escape */
"0x0009" = "insertTab:";
"shift,0x0009" = "insertBacktab:";

2
AppKit/NSPDFImageRep.m
View File

@ -47,7 +47,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
-copyWithZone:(NSZone *)zone {
NSPDFImageRep *result=[super copyWithZone:zone];
NSPDFImageRep *result=[super copyWithZone:zone]; // OK, don't see how this works.
result->_pdf=[_pdf copy];
result->_document=CGPDFDocumentRetain(_document);

2
AppKit/NSRuleEditor.m
View File

@ -8,4 +8,6 @@
return self;
}
-(void)encodeWithCoder:(NSCoder*)coder {
}
@end

2
AppKit/Win32.subproj/O2Font_gdi.m
View File

@ -141,7 +141,7 @@ static HFONT Win32FontHandleWithName(NSString *name,int unitsPerEm){
DWORD length=[provider length];
DWORD numberOfFonts=1;
_fontMemResource=AddFontMemResourceEx(bytes,length,0,&numberOfFonts);
_fontMemResource=AddFontMemResourceEx((PVOID)bytes,length,0,&numberOfFonts);
NSLog(@"FAILURE AddFontMemResourceEx bytes=%p length=%d numberOfFonts=%d,result=%x",bytes,length,numberOfFonts,_fontMemResource);
return self;

4
AppKit/Win32.subproj/Win32Display.m
View File

@ -269,10 +269,10 @@ static BOOL CALLBACK monitorEnumerator(HMONITOR hMonitor,HDC hdcMonitor,LPRECT r
{ @"secondarySelectedControlColor", COLOR_HIGHLIGHT }, // FIXME:
{ @"keyboardFocusIndicatorColor", COLOR_ACTIVEBORDER }, // FIXME:
{ @"windowFrameColor", COLOR_WINDOWFRAME }, // FIXME:
{ @"selectedMenuItemColor", COLOR_HIGHLIGHT }, // FIXME:
{ @"selectedMenuItemColor", 29 /* COLOR_MENUHILIGHT */ }, // FIXME:
{ @"selectedMenuItemTextColor", COLOR_HIGHLIGHTTEXT }, // FIXME:
// extensions
{ @"menuBackgroundColor", COLOR_MENU },
{ @"menuBackgroundColor", 30 /* COLOR_MENUBAR */ },
{ @"menuItemTextColor", COLOR_MENUTEXT },
{ @"_sourceListBackgroundColor", COLOR_WINDOW },

4
AppKit/Win32.subproj/Win32Window.m
View File

@ -872,9 +872,9 @@ static void initializeWindowClass(WNDCLASS *class){
+(void)initialize {
if(self==[Win32Window class]){
NSString *name=[[NSProcessInfo processInfo] processName];
NSString *name=[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIconFile"];
NSString *path=[[NSBundle mainBundle] pathForResource:name ofType:@"ico"];
HICON icon=(path==nil)?NULL:LoadImage(NULL,[path fileSystemRepresentation],IMAGE_ICON,0,0,LR_DEFAULTCOLOR|LR_LOADFROMFILE);
HICON icon=(path==nil)?NULL:LoadImage(NULL,[path fileSystemRepresentation],IMAGE_ICON,16,16,LR_DEFAULTCOLOR|LR_LOADFROMFILE);
static WNDCLASS _standardWindowClass,_borderlessWindowClass,_borderlessWindowClassWithShadow;
OSVERSIONINFOEX osVersion;

2
AppKit/nib.subproj/NSCustomResource.m
View File

@ -38,7 +38,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
NSImage *image=[NSImage imageNamed:_resourceName];
if([_resourceName hasSuffix:@"Template"])
[image setTemplate:YES];
[image setTemplate:YES]; // can't find this method, is it even ever called?
if(image!=nil){
[self release];

12
AppKit/nib.subproj/NSNibLoading.m
View File

@ -11,6 +11,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSDictionary.h>
#import <Foundation/NSAutoreleasePool.h>
#import <AppKit/NSRaise.h>
#import <Foundation/NSPlatform.h>
@implementation NSObject(NSNibLoading)
@ -35,11 +36,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
NSDictionary *nameTable=[NSDictionary dictionaryWithObject:owner forKey:NSNibOwner];
NSBundle *bundle=[NSBundle bundleForClass:[owner class]];
NSString *path;
path=[bundle pathForResource:name ofType:@"nib"];
NSString *platformName=[name stringByAppendingFormat:@"-%@",NSPlatformResourceNameSuffix];
path=[bundle pathForResource:platformName ofType:@"nib"];
if(path==nil)
path=[[NSBundle mainBundle] pathForResource:platformName ofType:@"nib"];
if(path==nil)
path=[bundle pathForResource:name ofType:@"nib"];
if(path==nil)
path=[[NSBundle mainBundle] pathForResource:name ofType:@"nib"];
if(path==nil)
return NO;

179
CoreVideo/CoreVideo.xcodeproj/project.pbxproj
View File

@ -27,9 +27,83 @@
};
/* End PBXBuildRule section */
/* Begin PBXContainerItemProxy section */
50ACFD4A1275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE01A7EC0C5D9B6900AEA51A /* Foundation.framework */;
remoteInfo = "Foundation-Windows-i386";
};
50ACFD4C1275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6EA04A7709E57D5F0067589C /* Foundation.framework */;
remoteInfo = "Foundation-Linux-i386";
};
50ACFD4E1275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6E4D932B0A2642BD003D335C /* Foundation.framework */;
remoteInfo = "Foundation-Solaris-sparc";
};
50ACFD501275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FED70A6B0C3B3D2C000CBE5B /* Foundation.framework */;
remoteInfo = "Foundation-Darwin-i386";
};
50ACFD521275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FED70FB70C3C09C7000CBE5B /* Foundation.framework */;
remoteInfo = "Foundation-Darwin-ppc";
};
50ACFD541275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE651A870FBC844C00464BFD /* Foundation.framework */;
remoteInfo = "Foundation-Darwin-x86_64";
};
50ACFD561275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 28D487A90FE04E7100DC03EF /* Foundation.framework */;
remoteInfo = "Foundation-Linux-ppc";
};
50ACFD581275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 15D921C0105E918000171406 /* Foundation.framework */;
remoteInfo = "Foundation-Linux-arm";
};
50ACFD5A1275F6F3008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FE30A2FF10C6ED6F00A1BF7F /* Foundation.framework */;
remoteInfo = "Foundation-FreeBSD-i386";
};
50ACFD5C1275F6F8008BEDDD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = FE01A5970C5D9B6900AEA51A /* Foundation-Windows-i386 */;
remoteInfo = "Foundation-Windows-i386";
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Foundation.xcodeproj; path = ../Foundation/Foundation.xcodeproj; sourceTree = SOURCE_ROOT; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* CoreVideo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreVideo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
FE43015A11E2531F00EBDD56 /* CVDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CVDisplayLink.h; sourceTree = "<group>"; };
@ -62,6 +136,7 @@
0867D691FE84028FC02AAC07 /* CoreVideo */ = {
isa = PBXGroup;
children = (
50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */,
FE43045A11E2779700EBDD56 /* CVReturn.h */,
FE43045811E2769E00EBDD56 /* CVBase.h */,
FE43017B11E253E900EBDD56 /* CoreVideo.h */,
@ -115,6 +190,22 @@
name = "Other Sources";
sourceTree = "<group>";
};
50ACFD3E1275F6F3008BEDDD /* Products */ = {
isa = PBXGroup;
children = (
50ACFD4B1275F6F3008BEDDD /* Foundation.framework */,
50ACFD4D1275F6F3008BEDDD /* Foundation.framework */,
50ACFD4F1275F6F3008BEDDD /* Foundation.framework */,
50ACFD511275F6F3008BEDDD /* Foundation.framework */,
50ACFD531275F6F3008BEDDD /* Foundation.framework */,
50ACFD551275F6F3008BEDDD /* Foundation.framework */,
50ACFD571275F6F3008BEDDD /* Foundation.framework */,
50ACFD591275F6F3008BEDDD /* Foundation.framework */,
50ACFD5B1275F6F3008BEDDD /* Foundation.framework */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@ -145,6 +236,7 @@
FE43016A11E2536B00EBDD56 /* PBXBuildRule */,
);
dependencies = (
50ACFD5D1275F6F8008BEDDD /* PBXTargetDependency */,
);
name = "CoreVideo-Windows-i386";
productInstallPath = "$(HOME)/Library/Frameworks";
@ -159,10 +251,23 @@
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "CoreVideo" */;
compatibilityVersion = "Xcode 3.1";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 0867D691FE84028FC02AAC07 /* CoreVideo */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 50ACFD3E1275F6F3008BEDDD /* Products */;
ProjectRef = 50ACFD3D1275F6F3008BEDDD /* Foundation.xcodeproj */;
},
);
projectRoot = "";
targets = (
8DC2EF4F0486A6940098B216 /* CoreVideo-Windows-i386 */,
@ -170,6 +275,72 @@
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
50ACFD4B1275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD4A1275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD4D1275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD4C1275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD4F1275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD4E1275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD511275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD501275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD531275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD521275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD551275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD541275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD571275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD561275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD591275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD581275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
50ACFD5B1275F6F3008BEDDD /* Foundation.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Foundation.framework;
remoteRef = 50ACFD5A1275F6F3008BEDDD /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
8DC2EF520486A6940098B216 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@ -192,6 +363,14 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
50ACFD5D1275F6F8008BEDDD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "Foundation-Windows-i386";
targetProxy = 50ACFD5C1275F6F8008BEDDD /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;

8
Foundation/Foundation.xcodeproj/project.pbxproj
View File

@ -12086,7 +12086,14 @@
isa = PBXProject;
buildConfigurationList = 6E2801B909746B8900EC542B /* Build configuration list for PBXProject "Foundation" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
);
mainGroup = 0867D691FE84028FC02AAC07 /* Foundation */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@ -16124,6 +16131,7 @@
buildSettings = {
ARCHS = i386;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = stabs;
DEPLOYMENT_LOCATION = YES;
DSTROOT = /;
EXECUTABLE_SUFFIX = .1.0.dll;

20
Foundation/NSDate/NSCalendar.h
View File

@ -13,16 +13,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@class NSDateComponents,NSTimeZone,NSLocale,NSDate;
enum {
NSEraCalendarUnit = kCFCalendarUnitEra,
NSYearCalendarUnit = kCFCalendarUnitYear,
NSMonthCalendarUnit = kCFCalendarUnitMonth,
NSDayCalendarUnit = kCFCalendarUnitDay,
NSHourCalendarUnit = kCFCalendarUnitHour,
NSMinuteCalendarUnit = kCFCalendarUnitMinute,
NSSecondCalendarUnit = kCFCalendarUnitSecond,
NSWeekCalendarUnit = kCFCalendarUnitWeek,
NSWeekdayCalendarUnit = kCFCalendarUnitWeekday,
NSWeekdayOrdinalCalendarUnit = kCFCalendarUnitWeekdayOrdinal,
NSEraCalendarUnit = kCFCalendarUnitEra,
NSYearCalendarUnit = kCFCalendarUnitYear,
NSMonthCalendarUnit = kCFCalendarUnitMonth,
NSDayCalendarUnit = kCFCalendarUnitDay,
NSHourCalendarUnit = kCFCalendarUnitHour,
NSMinuteCalendarUnit = kCFCalendarUnitMinute,
NSSecondCalendarUnit = kCFCalendarUnitSecond,
NSWeekCalendarUnit = kCFCalendarUnitWeek,
NSWeekdayCalendarUnit = kCFCalendarUnitWeekday,
NSWeekdayOrdinalCalendarUnit = kCFCalendarUnitWeekdayOrdinal,
// NSQuarterCalendarUnit = kCFCalendarUnitQuarter,
};
typedef NSUInteger NSCalendarUnit;

2
Foundation/NSKeyValueCoding/NSKVOInfoPerObject.m
View File

@ -45,7 +45,7 @@
}
-(void)removeKeyObserver:(NSKeyObserver *)keyObserver {
NSString *key=[keyObserver key];
NSString *key=[[[keyObserver key] retain] autorelease]; // do the retain/autorelease dance, because we just might release the key out from under us when the keyObserver is deallocated.
NSMutableArray *observers=[_dictionary objectForKey:key];
[observers removeObjectIdenticalTo:keyObserver];

9
Foundation/NSKeyedArchiving/NSKeyedUnarchiver.m
View File

@ -246,6 +246,15 @@ static inline NSNumber *_numberForKey(NSKeyedUnarchiver *self,NSString *key){
return [number intValue];
}
-(NSInteger)decodeIntegerForKey:(NSString *)key {
NSNumber *number=_numberForKey(self,key);
if(number==nil)
return 0;
return [number intValue];
}
// not a lot of validation
-(NSUInteger)decodeArrayOfFloats:(float *)result forKey:(NSString *)key {
NSString *string=[self decodeObjectForKey:key];

2
Foundation/NSURL/NSURLConnection.m
View File

@ -166,7 +166,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(void)URLProtocolDidFinishLoading:(NSURLProtocol *)urlProtocol {
if(_storagePolicy==NSURLCacheStorageNotAllowed){
[[NSURLCache sharedURLCache] removeCachedResponseForRequest:_response];
[[NSURLCache sharedURLCache] removeCachedResponseForRequest:_request];
}
else {
NSCachedURLResponse *cachedResponse=[[NSCachedURLResponse alloc] initWithResponse:_response data:_mutableData userInfo:nil storagePolicy:_storagePolicy];

4
Foundation/NSURL/NSURLProtocol_http.m
View File

@ -574,8 +574,8 @@ NSLog(@"parse error %d",__LINE__);
[sslProperties setObject:NSStreamSocketSecurityLevelNegotiatedSSL forKey:NSStreamSocketSecurityLevelKey];
[_inputStream setProperty:sslProperties forKey:kCFStreamPropertySSLSettings];
[_outputStream setProperty:sslProperties forKey:kCFStreamPropertySSLSettings];
[_inputStream setProperty:sslProperties forKey:(NSString *)kCFStreamPropertySSLSettings];
[_outputStream setProperty:sslProperties forKey:(NSString *)kCFStreamPropertySSLSettings];
}
[_inputStream setDelegate:self];

1
Foundation/platform_windows/NSTimeZone_win32.m
View File

@ -18,6 +18,7 @@
#import <Foundation/NSBundle.h>
#import <Foundation/NSPlatform.h>
#import <Foundation/NSDateFormatter.h>
#import <Foundation/NSKeyedUnarchiver.h>
#define MAX_KEY_LENGTH 255
#define MAX_VALUE_NAME 16383

6
Foundation/xml/NSXMLDocument.h
View File

@ -13,9 +13,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
enum {
NSXMLDocumentXMLKind = 0,
NSXMLDocumentXHTMLKind=1,
NSXMLDocumentHTMLKind=2,
NSXMLDocumentTextKind=3,
NSXMLDocumentXHTMLKind=1,
NSXMLDocumentHTMLKind=2,
NSXMLDocumentTextKind=3,
};
typedef NSUInteger NSXMLDocumentContentKind;

1
Foundation/xml/NSXMLNode.h
View File

@ -7,6 +7,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#import <Foundation/NSObject.h>
#import <Foundation/NSXMLNodeOptions.h>
@class NSArray,NSError,NSDictionary,NSXMLElement,NSXMLNode,NSXMLDocument,NSMutableArray;

2
Onyx2D/O2Context.m
View File

@ -155,7 +155,7 @@ static NSMutableArray *possibleContextClasses=nil;
_allowsAntialiasing=YES;
_textMatrix=O2AffineTransformIdentity;
_showTextFunction=O2ContextDefaultShowText;
_showGlyphsFunction=[self methodForSelector:@selector(showGlyphs:advances:count:)];
_showGlyphsFunction=(O2ContextShowGlyphsFunction)[self methodForSelector:@selector(showGlyphs:advances:count:)];
return self;
}

4
Onyx2D/O2Font.m
View File

@ -335,11 +335,11 @@ NSString *O2MacRomanGlyphNames[256]={
}
O2FontRef O2FontCreateWithFontName(NSString *name) {
return O2FontCreateWithFontName_platform(name);
return (O2FontRef)O2FontCreateWithFontName_platform(name);
}
O2FontRef O2FontCreateWithDataProvider(O2DataProviderRef provider) {
return O2FontCreateWithDataProvider_platform(provider);
return (O2FontRef)O2FontCreateWithDataProvider_platform(provider);
}
O2FontRef O2FontRetain(O2FontRef self) {

2
Onyx2D/O2PDFOperators.m
View File

@ -1029,7 +1029,7 @@ void O2PDF_render_Tf(O2PDFScanner *scanner,void *info) {
}
if([resource objectType]==O2PDFObjectTypeCached)
pdfFont=resource;
pdfFont=(O2PDFFont*)resource;
else {
if(![resource checkForType:kO2PDFObjectTypeDictionary value:&dictionary]){