merging back from 64-bit branch

git-svn-id: http://otx.osxninja.com/builds/trunk@487 5968870d-8a1b-0410-8ef2-9208d525af3e

Author: otxdev

English.lproj/MainMenu.nib/classes.nib

@@ -1,54 +1,51 @@
 /*
-	main.m
+    main.m
 
-	This file is in the public domain.
+    This file is in the public domain.
 */
 
+#import <Cocoa/Cocoa.h>
+
 #ifdef OTX_CLI
-	#import "CLIController.h"
+    #import "CLIController.h"
 #else
-	#import <AppKit/NSApplication.h>
+    #import <AppKit/NSApplication.h>
 #endif
 
-// ============================================================================
+BOOL gCancel = NO;
 
 int main(
-	int		argc,
-	char*	argv[])
+    int     argc,
+    char*   argv[])
 {
-	if (OS_IS_PRE_TIGER)
-	{
-		fprintf(stderr, "otx requires Mac OS X 10.4 or higher.\n");
-		return -1;
-	}
+    if (OS_IS_PRE_TIGER)
+    {
+        fprintf(stderr, "otx requires Mac OS X 10.4 or higher.\n");
+        return -1;
+    }
 
-	int	result	= 1;
+    int result  = 1;
 
 // OTX_CLI is defined in the CLI target settings. Much thanx to Slava Karpenko
 // and Mike Solomon for telling me about the -D flag.
 #ifdef OTX_CLI
-
-	NSAutoreleasePool*	pool		= [[NSAutoreleasePool alloc] init];
-	CLIController*		controller	=
-		[[CLIController alloc] initWithArgs: argv count: argc];
-
-	if (controller)
-	{
-		[controller processFile];
-		[controller release];
-
-		result	= noErr;
-	}
-	else
-		result	= -1;
-
-	[pool release];
-
+    NSAutoreleasePool*  pool        = [[NSAutoreleasePool alloc] init];
+    CLIController*      controller  =
+        [[CLIController alloc] initWithArgs: argv count: argc];
+
+    if (controller)
+    {
+        [controller processFile];
+        [controller release];
+        result  = noErr;
+    }
+    else
+        result  = -1;
+
+    [pool release];
 #else
-
-	result	= NSApplicationMain(argc, (const char**)argv);
-
+    result  = NSApplicationMain(argc, (const char**)argv);
 #endif
 
-	return result;
+    return result;
 }

English.lproj/MainMenu.nib/designable.nib

@@ -1,17 +1,18 @@
 /*
-	otx_Prefix.pch
+    otx_Prefix.pch
 
-	This file is in the public domain.
+    This file is in the public domain.
 */
 
-#ifndef NSAppKitVersionNumber10_4
-	#define	NSAppKitVersionNumber10_4 824
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+    extern BOOL gCancel;
 #endif
 
-#ifdef __OBJC__
-	#import <Cocoa/Cocoa.h>
+#ifndef NSAppKitVersionNumber10_4
+    #define NSAppKitVersionNumber10_4 824
 #endif
 
-#define	OS_IS_PRE_TIGER		NSAppKitVersionNumber < NSAppKitVersionNumber10_4
-#define	OS_IS_POST_TIGER	floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4
-#define	OS_IS_TIGER			(!OS_IS_PRE_TIGER) && (!OS_IS_POST_TIGER)
+#define OS_IS_PRE_TIGER     NSAppKitVersionNumber < NSAppKitVersionNumber10_4
+#define OS_IS_POST_TIGER    floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_4
+#define OS_IS_TIGER         (!OS_IS_PRE_TIGER) && (!OS_IS_POST_TIGER)