Index: unk/aux/cocotron/win32/cocotron/cocotron-r723.patch =================================================================== --- /trunk/aux/cocotron/win32/cocotron/cocotron-r723.patch (revision 13407) +++ (revision ) @@ -1,284 +1,0 @@ -Index: AppKit/NSPopUpButtonCell.m -=================================================================== ---- AppKit/NSPopUpButtonCell.m (revision 723) -+++ AppKit/NSPopUpButtonCell.m (working copy) -@@ -18,6 +18,15 @@ - - @implementation NSPopUpButtonCell - -+-init { -+ self = [super init]; -+ _pullsDown = NO; -+ _menu = [[[NSMenu alloc] init] retain]; -+ _arrowPosition = NSPopUpArrowAtCenter; -+ _preferredEdge = NSMaxYEdge; -+ return self; -+} -+ - -(void)encodeWithCoder:(NSCoder *)coder { - NSUnimplementedMethod(); - } -@@ -59,7 +68,9 @@ - [super initTextCell:string]; - _menu = [[NSMenu alloc] initWithTitle:string]; - [_menu addItemWithTitle:string action:[self action] keyEquivalent:@""]; -- -+ _arrowPosition = NSPopUpArrowAtCenter; -+ _preferredEdge = NSMaxYEdge; -+ - [self setPullsDown:pullDown]; - - return self; -Index: AppKit/NSApplication.m -=================================================================== ---- AppKit/NSApplication.m (revision 723) -+++ AppKit/NSApplication.m (working copy) -@@ -29,6 +29,7 @@ - #import - #import - #import -+#import - - NSString *NSModalPanelRunLoopMode=@"NSModalPanelRunLoopMode"; - NSString *NSEventTrackingRunLoopMode=@"NSEventTrackingRunLoopMode"; -@@ -413,6 +414,11 @@ - needsUntitled = [_delegate applicationShouldOpenUntitledFile: self]; - } - -+ if(needsUntitled && _delegate && [_delegate respondsToSelector: @selector(applicationOpenUntitledFile:)]) { -+ needsUntitled = ![_delegate applicationOpenUntitledFile: self]; -+ } -+ -+ - if(needsUntitled && controller && ![controller documentClassForType:[controller defaultType]]) { - needsUntitled = NO; - } -@@ -466,12 +472,18 @@ - } - - -(void)run { -- -- NSAutoreleasePool *pool=[NSAutoreleasePool new]; -- [self finishLaunching]; -- [pool release]; -+ static BOOL didlaunch = NO; -+ NSAutoreleasePool *pool; -+ -+ _isRunning=YES; -+ -+ if (!didlaunch) { -+ didlaunch = YES; -+ pool=[NSAutoreleasePool new]; -+ [self finishLaunching]; -+ [pool release]; -+ } - -- _isRunning=YES; - - do { - pool = [NSAutoreleasePool new]; -Index: AppKit/NSImageNameGoLeftTemplate.pdf -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream - -Property changes on: AppKit/NSImageNameGoLeftTemplate.pdf -___________________________________________________________________ -Added: svn:mime-type - + application/octet-stream - -Index: AppKit/NSMenu.subproj/NSMenu.m -=================================================================== ---- AppKit/NSMenu.subproj/NSMenu.m (revision 723) -+++ AppKit/NSMenu.subproj/NSMenu.m (working copy) -@@ -40,9 +40,10 @@ - } - - -(void)encodeWithCoder:(NSCoder *)coder { -- [coder encodeObject:_title forKey:@"NSMenu title"]; -- [coder encodeObject:_itemArray forKey:@"NSMenu itemArray"]; -- [coder encodeBool:_autoenablesItems forKey:@"NSMenu autoenablesItems"]; -+ [coder encodeObject:_title forKey:@"NSTitle"]; -+ [coder encodeObject:_name forKey:@"NSName"]; -+ [coder encodeObject:_itemArray forKey:@"NSMenuItems"]; -+ [coder encodeBool:!_autoenablesItems forKey:@"NSNoAutoenable"]; - } - - -initWithCoder:(NSCoder *)coder { -@@ -221,7 +222,7 @@ - - -(void)addItem:(NSMenuItem *)item { - [item performSelector:@selector(_setMenu:) withObject:self]; -- [[self mutableArrayValueForKey:@"itemArray"] addObject:item]; -+ [_itemArray addObject:item]; - } - - -(NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action keyEquivalent:(NSString *)keyEquivalent { -@@ -239,7 +240,7 @@ - - -(void)removeItem:(NSMenuItem *)item { - [item performSelector:@selector(_setMenu:) withObject:nil]; -- [[self mutableArrayValueForKey:@"itemArray"] removeObjectIdenticalTo:item]; -+ [_itemArray removeObjectIdenticalTo:item]; - } - - -(void)removeItemAtIndex:(int)index { -@@ -248,7 +249,7 @@ - - -(void)insertItem:(NSMenuItem *)item atIndex:(int)index { - [item performSelector:@selector(_setMenu:) withObject:self]; -- [[self mutableArrayValueForKey:@"itemArray"] insertObject:item atIndex:index]; -+ [_itemArray insertObject:item atIndex:index]; - } - - -(NSMenuItem *)insertItemWithTitle:(NSString *)title action:(SEL)action keyEquivalent:(NSString *)keyEquivalent atIndex:(int)index { -Index: AppKit/AppKit.xcodeproj/project.pbxproj -=================================================================== ---- AppKit/AppKit.xcodeproj/project.pbxproj (revision 723) -+++ AppKit/AppKit.xcodeproj/project.pbxproj (working copy) -@@ -27,6 +27,12 @@ - A1CC70491005371100DB9974 /* NSTextFieldBinder.m in Sources */ = {isa = PBXBuildFile; fileRef = A1CC70411005371100DB9974 /* NSTextFieldBinder.m */; }; - C81BEA0F0EA6038800478D50 /* O2Context_cairo.h in Headers */ = {isa = PBXBuildFile; fileRef = C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */; settings = {ATTRIBUTES = (Private, ); }; }; - C81BEA100EA6038800478D50 /* O2Context_cairo.m in Sources */ = {isa = PBXBuildFile; fileRef = C81BEA0E0EA6038800478D50 /* O2Context_cairo.m */; }; -+ C829A6A310FF911400A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; -+ C829A6A410FF911F00A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; -+ C829A6A510FF912000A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; -+ C829A6A610FF912100A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; -+ C829A6A710FF912200A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; -+ C829A6B310FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */; }; - C84909370E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = C84909350E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; - C84909380E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C84909360E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m */; }; - C85D91950EE6A806004EBAEA /* NSDictionaryController.h in Headers */ = {isa = PBXBuildFile; fileRef = C85D91930EE6A806004EBAEA /* NSDictionaryController.h */; settings = {ATTRIBUTES = (Public, ); }; }; -@@ -4414,6 +4420,8 @@ - A1CC70411005371100DB9974 /* NSTextFieldBinder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTextFieldBinder.m; sourceTree = ""; }; - C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2Context_cairo.h; sourceTree = ""; }; - C81BEA0E0EA6038800478D50 /* O2Context_cairo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = O2Context_cairo.m; sourceTree = ""; }; -+ C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = NSImageNameGoLeftTemplate.pdf; sourceTree = ""; }; -+ C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = NSImageNameGoRightTemplate.pdf; sourceTree = ""; }; - C84909350E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSUserDefaultsControllerProxy.h; sourceTree = ""; }; - C84909360E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSUserDefaultsControllerProxy.m; sourceTree = ""; }; - C85D91930EE6A806004EBAEA /* NSDictionaryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDictionaryController.h; sourceTree = ""; }; -@@ -5198,6 +5206,8 @@ - 6E2B54E60976075300DA0954 /* Images */ = { - isa = PBXGroup; - children = ( -+ C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */, -+ C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */, - FEED24790EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf */, - FE86887C0BC3FFA4009F515C /* NSButtonCell_disclosure_highlighted.tif */, - FE86887D0BC3FFA4009F515C /* NSButtonCell_disclosure_normal.tif */, -@@ -8210,6 +8220,7 @@ - C88977040EA0BF3100D0A0A2 /* NSSystemInfoPanel.nib in Resources */, - FEED247B0EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf in Resources */, - FEE36B810F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, -+ C829A6A410FF911F00A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -8259,6 +8270,7 @@ - C8A2E56A0F07EA1F0054397C /* NSSystemInfoPanel.nib in Resources */, - C8A2E56B0F07EA1F0054397C /* NSImageNameRefreshTemplate.pdf in Resources */, - FEE36B820F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, -+ C829A6A510FF912000A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -8308,6 +8320,8 @@ - FE8286820D34727900F7489F /* NSSystemInfoPanel.nib in Resources */, - FEED247A0EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf in Resources */, - FEE36B800F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, -+ C829A6A310FF911400A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, -+ C829A6B310FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -8357,6 +8371,7 @@ - FE5A8BD910C6F50E005E348A /* NSSystemInfoPanel.nib in Resources */, - FE5A8BDA10C6F50E005E348A /* NSImageNameRefreshTemplate.pdf in Resources */, - FE5A8BDB10C6F50E005E348A /* NSToolbarOverflowArrow.pdf in Resources */, -+ C829A6A710FF912200A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -@@ -8406,6 +8421,7 @@ - FEA316430FD5667D00F480D4 /* NSSystemInfoPanel.nib in Resources */, - FEA316440FD5667D00F480D4 /* NSImageNameRefreshTemplate.pdf in Resources */, - FEA316450FD5667D00F480D4 /* NSToolbarOverflowArrow.pdf in Resources */, -+ C829A6A610FF912100A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -Index: AppKit/nib.subproj/NSCustomResource.m -=================================================================== ---- AppKit/nib.subproj/NSCustomResource.m (revision 723) -+++ AppKit/nib.subproj/NSCustomResource.m (working copy) -@@ -37,7 +37,15 @@ - if([_className isEqualToString:@"NSImage"]){ - NSImage *image; - -- if([_resourceName isEqualToString:@"NSRefreshTemplate"]){ -+ if([_resourceName isEqualToString:@"NSGoLeftTemplate"]){ -+ image=[NSImage imageNamed:@"NSImageNameGoLeftTemplate"]; -+ [image setSize:NSMakeSize(12,12)]; -+ } -+ else if([_resourceName isEqualToString:@"NSGoRightTemplate"]){ -+ image=[NSImage imageNamed:@"NSImageNameGoRightTemplate"]; -+ [image setSize:NSMakeSize(12,12)]; -+ } -+ else if([_resourceName isEqualToString:@"NSRefreshTemplate"]){ - image=[NSImage imageNamed:@"NSImageNameRefreshTemplate"]; - [image setSize:NSMakeSize(12,12)]; - } -Index: AppKit/NSFontManager.m -=================================================================== ---- AppKit/NSFontManager.m (revision 723) -+++ AppKit/NSFontManager.m (working copy) -@@ -306,7 +306,6 @@ - return [NSFont fontWithName:[newface name] size:[font pointSize]]; - - NSLog(@"%s failed, %@ %d",sel_getName(_cmd),[font fontName],addTraits); -- NSUnimplementedMethod(); - return font; - } - -Index: AppKit/NSImageNameGoRightTemplate.pdf -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream - -Property changes on: AppKit/NSImageNameGoRightTemplate.pdf -___________________________________________________________________ -Added: svn:mime-type - + application/octet-stream - -Index: AppKit/NSDocument.m -=================================================================== ---- AppKit/NSDocument.m (revision 723) -+++ AppKit/NSDocument.m (working copy) -@@ -21,6 +21,8 @@ - - @implementation NSDocument - -+static int untitled_document_number = 0; -+ - +(NSArray *)readableTypes { - int i; - NSArray *knownDocTypes = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDocumentTypes"]; -@@ -98,7 +100,7 @@ - _fileURL=nil; - _fileType=nil; - _changeCount=0; -- _untitledNumber=0; -+ _untitledNumber=untitled_document_number++; - _hasUndoManager=YES; - _activeEditors=[NSMutableArray new]; - } -@@ -344,7 +346,7 @@ - { - if(_fileURL==nil) - { -- if(_untitledNumber > 1) -+ if(_untitledNumber != 0) - return [NSString stringWithFormat:@"Untitled %d", _untitledNumber]; - else - return @"Untitled"; Index: /trunk/aux/cocotron/win32/cocotron/cocotron-r724.patch =================================================================== --- /trunk/aux/cocotron/win32/cocotron/cocotron-r724.patch (revision 13408) +++ /trunk/aux/cocotron/win32/cocotron/cocotron-r724.patch (revision 13408) @@ -0,0 +1,335 @@ +Index: AppKit/NSPopUpButtonCell.m +=================================================================== +--- AppKit/NSPopUpButtonCell.m (revision 724) ++++ AppKit/NSPopUpButtonCell.m (working copy) +@@ -18,6 +18,15 @@ + + @implementation NSPopUpButtonCell + ++-init { ++ self = [super init]; ++ _pullsDown = NO; ++ _menu = [[[NSMenu alloc] init] retain]; ++ _arrowPosition = NSPopUpArrowAtCenter; ++ _preferredEdge = NSMaxYEdge; ++ return self; ++} ++ + -(void)encodeWithCoder:(NSCoder *)coder { + NSUnimplementedMethod(); + } +@@ -59,7 +68,9 @@ + [super initTextCell:string]; + _menu = [[NSMenu alloc] initWithTitle:string]; + [_menu addItemWithTitle:string action:[self action] keyEquivalent:@""]; +- ++ _arrowPosition = NSPopUpArrowAtCenter; ++ _preferredEdge = NSMaxYEdge; ++ + [self setPullsDown:pullDown]; + + return self; +Index: AppKit/NSApplication.m +=================================================================== +--- AppKit/NSApplication.m (revision 724) ++++ AppKit/NSApplication.m (working copy) +@@ -29,6 +29,7 @@ + #import + #import + #import ++#import + + NSString *NSModalPanelRunLoopMode=@"NSModalPanelRunLoopMode"; + NSString *NSEventTrackingRunLoopMode=@"NSEventTrackingRunLoopMode"; +@@ -413,6 +414,11 @@ + needsUntitled = [_delegate applicationShouldOpenUntitledFile: self]; + } + ++ if(needsUntitled && _delegate && [_delegate respondsToSelector: @selector(applicationOpenUntitledFile:)]) { ++ needsUntitled = ![_delegate applicationOpenUntitledFile: self]; ++ } ++ ++ + if(needsUntitled && controller && ![controller documentClassForType:[controller defaultType]]) { + needsUntitled = NO; + } +@@ -466,12 +472,18 @@ + } + + -(void)run { +- +- NSAutoreleasePool *pool=[NSAutoreleasePool new]; +- [self finishLaunching]; +- [pool release]; ++ static BOOL didlaunch = NO; ++ NSAutoreleasePool *pool; ++ ++ _isRunning=YES; ++ ++ if (!didlaunch) { ++ didlaunch = YES; ++ pool=[NSAutoreleasePool new]; ++ [self finishLaunching]; ++ [pool release]; ++ } + +- _isRunning=YES; + + do { + pool = [NSAutoreleasePool new]; +Index: AppKit/NSImageNameGoLeftTemplate.pdf +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: AppKit/NSImageNameGoLeftTemplate.pdf +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: AppKit/NSMenu.subproj/NSMenu.m +=================================================================== +--- AppKit/NSMenu.subproj/NSMenu.m (revision 724) ++++ AppKit/NSMenu.subproj/NSMenu.m (working copy) +@@ -40,9 +40,10 @@ + } + + -(void)encodeWithCoder:(NSCoder *)coder { +- [coder encodeObject:_title forKey:@"NSMenu title"]; +- [coder encodeObject:_itemArray forKey:@"NSMenu itemArray"]; +- [coder encodeBool:_autoenablesItems forKey:@"NSMenu autoenablesItems"]; ++ [coder encodeObject:_title forKey:@"NSTitle"]; ++ [coder encodeObject:_name forKey:@"NSName"]; ++ [coder encodeObject:_itemArray forKey:@"NSMenuItems"]; ++ [coder encodeBool:!_autoenablesItems forKey:@"NSNoAutoenable"]; + } + + -initWithCoder:(NSCoder *)coder { +@@ -221,7 +222,7 @@ + + -(void)addItem:(NSMenuItem *)item { + [item performSelector:@selector(_setMenu:) withObject:self]; +- [[self mutableArrayValueForKey:@"itemArray"] addObject:item]; ++ [_itemArray addObject:item]; + } + + -(NSMenuItem *)addItemWithTitle:(NSString *)title action:(SEL)action keyEquivalent:(NSString *)keyEquivalent { +@@ -239,7 +240,7 @@ + + -(void)removeItem:(NSMenuItem *)item { + [item performSelector:@selector(_setMenu:) withObject:nil]; +- [[self mutableArrayValueForKey:@"itemArray"] removeObjectIdenticalTo:item]; ++ [_itemArray removeObjectIdenticalTo:item]; + } + + -(void)removeItemAtIndex:(int)index { +@@ -248,7 +249,7 @@ + + -(void)insertItem:(NSMenuItem *)item atIndex:(int)index { + [item performSelector:@selector(_setMenu:) withObject:self]; +- [[self mutableArrayValueForKey:@"itemArray"] insertObject:item atIndex:index]; ++ [_itemArray insertObject:item atIndex:index]; + } + + -(NSMenuItem *)insertItemWithTitle:(NSString *)title action:(SEL)action keyEquivalent:(NSString *)keyEquivalent atIndex:(int)index { +Index: AppKit/AppKit.xcodeproj/project.pbxproj +=================================================================== +--- AppKit/AppKit.xcodeproj/project.pbxproj (revision 724) ++++ AppKit/AppKit.xcodeproj/project.pbxproj (working copy) +@@ -27,6 +27,12 @@ + A1CC70491005371100DB9974 /* NSTextFieldBinder.m in Sources */ = {isa = PBXBuildFile; fileRef = A1CC70411005371100DB9974 /* NSTextFieldBinder.m */; }; + C81BEA0F0EA6038800478D50 /* O2Context_cairo.h in Headers */ = {isa = PBXBuildFile; fileRef = C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */; settings = {ATTRIBUTES = (Private, ); }; }; + C81BEA100EA6038800478D50 /* O2Context_cairo.m in Sources */ = {isa = PBXBuildFile; fileRef = C81BEA0E0EA6038800478D50 /* O2Context_cairo.m */; }; ++ C829A6A310FF911400A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; ++ C829A6A410FF911F00A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; ++ C829A6A510FF912000A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; ++ C829A6A610FF912100A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; ++ C829A6A710FF912200A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */; }; ++ C829A6B310FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */; }; + C84909370E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = C84909350E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h */; settings = {ATTRIBUTES = (Private, ); }; }; + C84909380E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = C84909360E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m */; }; + C85D91950EE6A806004EBAEA /* NSDictionaryController.h in Headers */ = {isa = PBXBuildFile; fileRef = C85D91930EE6A806004EBAEA /* NSDictionaryController.h */; settings = {ATTRIBUTES = (Public, ); }; }; +@@ -4414,6 +4420,8 @@ + A1CC70411005371100DB9974 /* NSTextFieldBinder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSTextFieldBinder.m; sourceTree = ""; }; + C81BEA0D0EA6038800478D50 /* O2Context_cairo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = O2Context_cairo.h; sourceTree = ""; }; + C81BEA0E0EA6038800478D50 /* O2Context_cairo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = O2Context_cairo.m; sourceTree = ""; }; ++ C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = NSImageNameGoLeftTemplate.pdf; sourceTree = ""; }; ++ C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = NSImageNameGoRightTemplate.pdf; sourceTree = ""; }; + C84909350E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSUserDefaultsControllerProxy.h; sourceTree = ""; }; + C84909360E8D1FB900BA6D3A /* NSUserDefaultsControllerProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSUserDefaultsControllerProxy.m; sourceTree = ""; }; + C85D91930EE6A806004EBAEA /* NSDictionaryController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDictionaryController.h; sourceTree = ""; }; +@@ -5198,6 +5206,8 @@ + 6E2B54E60976075300DA0954 /* Images */ = { + isa = PBXGroup; + children = ( ++ C829A6B210FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf */, ++ C829A6A210FF911400A2306E /* NSImageNameGoLeftTemplate.pdf */, + FEED24790EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf */, + FE86887C0BC3FFA4009F515C /* NSButtonCell_disclosure_highlighted.tif */, + FE86887D0BC3FFA4009F515C /* NSButtonCell_disclosure_normal.tif */, +@@ -8210,6 +8220,7 @@ + C88977040EA0BF3100D0A0A2 /* NSSystemInfoPanel.nib in Resources */, + FEED247B0EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf in Resources */, + FEE36B810F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, ++ C829A6A410FF911F00A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -8259,6 +8270,7 @@ + C8A2E56A0F07EA1F0054397C /* NSSystemInfoPanel.nib in Resources */, + C8A2E56B0F07EA1F0054397C /* NSImageNameRefreshTemplate.pdf in Resources */, + FEE36B820F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, ++ C829A6A510FF912000A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -8308,6 +8320,8 @@ + FE8286820D34727900F7489F /* NSSystemInfoPanel.nib in Resources */, + FEED247A0EC9E8F200A5B07E /* NSImageNameRefreshTemplate.pdf in Resources */, + FEE36B800F4B20C6005AEBBF /* NSToolbarOverflowArrow.pdf in Resources */, ++ C829A6A310FF911400A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, ++ C829A6B310FFA2D100A2306E /* NSImageNameGoRightTemplate.pdf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -8357,6 +8371,7 @@ + FE5A8BD910C6F50E005E348A /* NSSystemInfoPanel.nib in Resources */, + FE5A8BDA10C6F50E005E348A /* NSImageNameRefreshTemplate.pdf in Resources */, + FE5A8BDB10C6F50E005E348A /* NSToolbarOverflowArrow.pdf in Resources */, ++ C829A6A710FF912200A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +@@ -8406,6 +8421,7 @@ + FEA316430FD5667D00F480D4 /* NSSystemInfoPanel.nib in Resources */, + FEA316440FD5667D00F480D4 /* NSImageNameRefreshTemplate.pdf in Resources */, + FEA316450FD5667D00F480D4 /* NSToolbarOverflowArrow.pdf in Resources */, ++ C829A6A610FF912100A2306E /* NSImageNameGoLeftTemplate.pdf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +Index: AppKit/nib.subproj/NSCustomResource.m +=================================================================== +--- AppKit/nib.subproj/NSCustomResource.m (revision 724) ++++ AppKit/nib.subproj/NSCustomResource.m (working copy) +@@ -37,7 +37,15 @@ + if([_className isEqualToString:@"NSImage"]){ + NSImage *image; + +- if([_resourceName isEqualToString:@"NSRefreshTemplate"]){ ++ if([_resourceName isEqualToString:@"NSGoLeftTemplate"]){ ++ image=[NSImage imageNamed:@"NSImageNameGoLeftTemplate"]; ++ [image setSize:NSMakeSize(12,12)]; ++ } ++ else if([_resourceName isEqualToString:@"NSGoRightTemplate"]){ ++ image=[NSImage imageNamed:@"NSImageNameGoRightTemplate"]; ++ [image setSize:NSMakeSize(12,12)]; ++ } ++ else if([_resourceName isEqualToString:@"NSRefreshTemplate"]){ + image=[NSImage imageNamed:@"NSImageNameRefreshTemplate"]; + [image setSize:NSMakeSize(12,12)]; + } +Index: AppKit/NSFontManager.m +=================================================================== +--- AppKit/NSFontManager.m (revision 724) ++++ AppKit/NSFontManager.m (working copy) +@@ -306,7 +306,6 @@ + return [NSFont fontWithName:[newface name] size:[font pointSize]]; + + NSLog(@"%s failed, %@ %d",sel_getName(_cmd),[font fontName],addTraits); +- NSUnimplementedMethod(); + return font; + } + +Index: AppKit/NSToolbar.subproj/NSToolbarView.m +=================================================================== +--- AppKit/NSToolbar.subproj/NSToolbarView.m (revision 724) ++++ AppKit/NSToolbar.subproj/NSToolbarView.m (working copy) +@@ -237,6 +237,10 @@ + + + -(void)drawRect:(NSRect)rect { ++ //fix problem where the background of the toolbar would be partly black ++ [[NSColor controlColor] setFill]; ++ NSRectFill(rect); ++ + if(_overflow){ + NSSize imageSize=[[self overflowImage] size]; + NSRect rect=[self overflowRect]; +Index: AppKit/NSToolbar.subproj/NSToolbarItem.m +=================================================================== +--- AppKit/NSToolbar.subproj/NSToolbarItem.m (revision 724) ++++ AppKit/NSToolbar.subproj/NSToolbarItem.m (working copy) +@@ -504,7 +504,18 @@ + imageRect.origin.y=bounds.origin.y+labelHeight; + imageRect.origin.x=bounds.origin.x+floor((bounds.size.width-imageRect.size.width)/2); + [image drawInRect:imageRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:highlighted?0.5:1.0]; +- } ++ } ++ //Erlend: add support for non-images (NSButton, NSSegmentedControl) ++ else { ++ NSRect viewRect; ++ viewRect.origin.y=bounds.origin.y+labelHeight; ++ viewRect.origin.x=bounds.origin.x; ++ ++ viewRect.size.width = bounds.size.width; ++ viewRect.size.height = bounds.size.height - labelHeight; ++ ++ [[self view] setFrame: viewRect]; ++ } + } + + } +Index: AppKit/NSImageNameGoRightTemplate.pdf +=================================================================== +Cannot display: file marked as a binary type. +svn:mime-type = application/octet-stream + +Property changes on: AppKit/NSImageNameGoRightTemplate.pdf +___________________________________________________________________ +Added: svn:mime-type + + application/octet-stream + +Index: AppKit/NSDocument.m +=================================================================== +--- AppKit/NSDocument.m (revision 724) ++++ AppKit/NSDocument.m (working copy) +@@ -21,6 +21,8 @@ + + @implementation NSDocument + ++static int untitled_document_number = 0; ++ + +(NSArray *)readableTypes { + int i; + NSArray *knownDocTypes = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDocumentTypes"]; +@@ -98,7 +100,7 @@ + _fileURL=nil; + _fileType=nil; + _changeCount=0; +- _untitledNumber=0; ++ _untitledNumber=untitled_document_number++; + _hasUndoManager=YES; + _activeEditors=[NSMutableArray new]; + } +@@ -344,7 +346,7 @@ + { + if(_fileURL==nil) + { +- if(_untitledNumber > 1) ++ if(_untitledNumber != 0) + return [NSString stringWithFormat:@"Untitled %d", _untitledNumber]; + else + return @"Untitled"; +Index: Foundation/NSNetService/NSNetServices.m +=================================================================== +--- Foundation/NSNetService/NSNetServices.m (revision 724) ++++ Foundation/NSNetService/NSNetServices.m (working copy) +@@ -22,6 +22,7 @@ + #import + #import + #import ++#import + + #ifdef WIN32 + #import // for ntohs