source: trunk/aux/cocotron/win32/cocotron/cocotron-r609.patch @ 12653

Foundation/NSUserDefaults/NSUserDefaults.m

@@ -313 +313 @@
 }
 
 -(NSInteger)integerForKey:(NSString *)defaultName {
-   NSNumber *number=[self objectForKey:defaultName];
+   id number=[self objectForKey:defaultName];
 
-   return [number isKindOfClass:objc_lookUpClass("NSNumber")]?[number intValue]:0;
+   return [number isKindOfClass:objc_lookUpClass("NSString")]?[(NSString *)number intValue]:
+     ([number isKindOfClass:objc_lookUpClass("NSNumber")]?[(NSNumber *)number intValue]:0);
 }
 
 
 -(float)floatForKey:(NSString *)defaultName {
-   NSNumber *number=[self objectForKey:defaultName];
+   id number=[self objectForKey:defaultName];
 
-   return [number isKindOfClass:objc_lookUpClass("NSNumber")]?[number floatValue]:0.0f;
+   return [number isKindOfClass:objc_lookUpClass("NSString")]?[(NSString *)number floatValue]:
+     ([number isKindOfClass:objc_lookUpClass("NSNumber")]?[(NSNumber *)number floatValue]:0.0);
+
 }
 
 -(void)setObject:value forKey:(NSString *)key {
@@ -338 +341 @@
 }
 
 -(void)setInteger:(NSInteger)value forKey:(NSString *)defaultName {
-   [self setObject:[NSNumber numberWithInteger:value] forKey:defaultName];
+  [self setObject:[NSString stringWithFormat: @"%d",value] forKey:defaultName];
 }
 
 -(void)setFloat:(float)value forKey:(NSString *)defaultName {
-   [self setObject:[NSNumber numberWithFloat:value] forKey:defaultName];
+  [self setObject:[NSString stringWithFormat: @"%f",value] forKey:defaultName];
 }
 
 -(void)removeObjectForKey:(NSString *)key {

AppKit/NSApplication.h

@@ -9 +9 @@
 #import <AppKit/NSResponder.h>
 #import <AppKit/AppKitExport.h>
 #import <AppKit/NSGraphics.h>
+#import <AppKit/NSWindow.h>
 
-@class NSWindow,NSImage,NSMenu, NSPasteboard, NSDisplay;
+@class NSWindow,NSImage,NSMenu, NSPasteboard, NSDisplay, NSWindowController, NSDocument;
 
 APPKIT_EXPORT NSString *NSModalPanelRunLoopMode;
 APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
@@ -209 +210 @@
 @end
 
 @interface NSObject(NSApplication_serviceRequest)
+
 -(BOOL)writeSelectionToPasteboard:(NSPasteboard *)pasteboard types:(NSArray *)types;
 @end
 

AppKit/NSApplication.m

@@ -29 +29 @@
 #import <AppKit/CGWindow.h>
 #import <AppKit/NSRaise.h>
 #import <objc/message.h>
+#import <AppKit/NSWindow.h>
 
 NSString *NSModalPanelRunLoopMode=@"NSModalPanelRunLoopMode";
 NSString *NSEventTrackingRunLoopMode=@"NSEventTrackingRunLoopMode";
@@ -413 +414 @@
        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 +472 @@
 }
 
 -(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];

AppKit/NSDocument.m

@@ -21 +21 @@
 
 @implementation NSDocument
 
+static int untitled_document_number = 0;
+
 +(NSArray *)readableTypes {
    int             i;
    NSArray        *knownDocTypes = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleDocumentTypes"];
@@ -98 +100 @@
       _fileURL=nil;
       _fileType=nil;
       _changeCount=0;
-      _untitledNumber=0;
+      _untitledNumber=untitled_document_number++;
       _hasUndoManager=YES;
       _activeEditors=[NSMutableArray new];
     }
@@ -344 +346 @@
 {
   if(_fileURL==nil) 
     {
-      if(_untitledNumber > 1)
+      if(_untitledNumber != 0)
         return [NSString stringWithFormat:@"Untitled %d", _untitledNumber];
       else
         return @"Untitled";