fix 10.5 compatibility

git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@5708 694ef91d-65df-0310-b7bb-92e67a308ead
R-macos · Mar 15, 2011 · 9da0dfe · 9da0dfe
1 parent b9452bc
commit 9da0dfe
Show file tree

Hide file tree

Showing 27 changed files with 82 additions and 82 deletions.
diff --git a/CCComp.h b/CCComp.h
@@ -0,0 +1,46 @@
+/*
+ *  CCComp.h - Common Cocoa Compatibility
+ *  R
+ *
+ *  Include in all files instead of Cocoa, it provides compatibility work-arounds.
+ *
+ *  Created by Simon Urbanek on 3/15/11.
+ *  Copyright 2011 Simon Urbanek. All rights reserved.
+ *
+ */
+
+#import <Cocoa/Cocoa.h>
+#import <Availability.h>
+
+/* the following protocols are new in 10.6 (and useful) so for older OS X we have to define them */
+#ifndef MAC_OS_X_VERSION_10_6
+#define MAC_OS_X_VERSION_10_6 1060
+#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
+@protocol NSTextStorageDelegate <NSObject>
+@optional
+- (void)textStorageWillProcessEditing:(NSNotification *)notification;   /* Delegate can change the characters or attributes */
+- (void)textStorageDidProcessEditing:(NSNotification *)notification;    /* Delegate can change the attributes */
+@end
+@protocol NSToolbarDelegate <NSObject>
+@optional
+- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
+- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar;
+- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar;
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar;
+- (void)toolbarWillAddItem: (NSNotification *)notification;
+- (void)toolbarDidRemoveItem: (NSNotification *)notification;
+@end
+#endif
+
+/* for pre-10.5 compatibility */
+#ifndef NSINTEGER_DEFINED
+#if __LP64__ || NS_BUILD_32_LIKE_64
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif
+#define NSINTEGER_DEFINED 1
+#endif
diff --git a/DataManager.h b/DataManager.h
@@ -29,7 +29,7 @@
 
 /* DataManager */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "Tools/SortableDataSource.h"
 
 @interface DataManager : NSObject

diff --git a/HelpManager.h b/HelpManager.h
@@ -29,7 +29,7 @@
 
 /* HelpManager */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import <WebKit/WebKit.h>
 #import <WebKit/WebFrame.h>
 

diff --git a/PackageInstaller.h b/PackageInstaller.h
@@ -46,7 +46,7 @@
 #define kBinary		1
 #define kSource		0
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 @interface PackageEntry : NSObject {
 	NSString *name;

diff --git a/PackageInstaller.m b/PackageInstaller.m
@@ -47,18 +47,6 @@
 	@".libPaths()[1]"
 };
 
-/* for pre-10.5 compatibility */
-#ifndef NSINTEGER_DEFINED
-#if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
-#define NSINTEGER_DEFINED 1
-#endif
-
 @interface PackageEntry (PrivateMethods)
 - (NSString*) name;
 - (NSString*) iver;

diff --git a/PackageManager.h b/PackageManager.h
@@ -29,7 +29,7 @@
 
 /* PackageManager */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 // structure holding all available data about a package
 typedef struct pkgManagerEntry {

diff --git a/Preferences.h b/Preferences.h
@@ -29,7 +29,7 @@
  *  Create by Simon Urbanek on 12/5/2004
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 @protocol PreferencesDependent
 - (void) updatePreferences;

diff --git a/R.xcodeproj/project.pbxproj b/R.xcodeproj/project.pbxproj
@@ -135,6 +135,7 @@
 		6807116E0EB0CD4200436993 /* InfoPlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 6807116D0EB0CD4200436993 /* InfoPlist.h */; };
 		6807E645080EAE4100A03223 /* GlobalExHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 6807E643080EAE4100A03223 /* GlobalExHandler.h */; };
 		6807E646080EAE4100A03223 /* GlobalExHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6807E644080EAE4100A03223 /* GlobalExHandler.m */; };
+		6825104D132F337800367C93 /* CCComp.h in Headers */ = {isa = PBXBuildFile; fileRef = 6825104C132F337800367C93 /* CCComp.h */; };
 		6828383907804DFC004617B7 /* ExceptionHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6828383807804DFC004617B7 /* ExceptionHandling.framework */; };
 		684D008507BD72BE0047EEF6 /* SyntaxColorsPrefPane.h in Headers */ = {isa = PBXBuildFile; fileRef = 684D008307BD72BE0047EEF6 /* SyntaxColorsPrefPane.h */; };
 		684D008607BD72BE0047EEF6 /* SyntaxColorsPrefPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 684D008407BD72BE0047EEF6 /* SyntaxColorsPrefPane.m */; };
@@ -361,6 +362,7 @@
 		6807E644080EAE4100A03223 /* GlobalExHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlobalExHandler.m; sourceTree = "<group>"; };
 		6812EC9E07BA6A360000B6A8 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = de.lproj/EditorPrefPane.nib; sourceTree = "<group>"; };
 		681D40BE081D653B0019CB4C /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/Credits.rtf; sourceTree = "<group>"; };
+		6825104C132F337800367C93 /* CCComp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComp.h; sourceTree = "<group>"; };
 		6828383807804DFC004617B7 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
 		684D008307BD72BE0047EEF6 /* SyntaxColorsPrefPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SyntaxColorsPrefPane.h; sourceTree = "<group>"; };
 		684D008407BD72BE0047EEF6 /* SyntaxColorsPrefPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SyntaxColorsPrefPane.m; sourceTree = "<group>"; };
@@ -725,6 +727,7 @@
 			isa = PBXGroup;
 			children = (
 				68F84C6109ABB2BF0098D772 /* privateR.h */,
+				6825104C132F337800367C93 /* CCComp.h */,
 				32CA4F630368D1EE00C91783 /* R_Prefix.pch */,
 				6855194007B8FDDF00F3A57C /* RGUI.h */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
@@ -887,6 +890,7 @@
 				BC12B313130A65CE009F7D3F /* RScriptEditorTextView.h in Headers */,
 				BCCE4A38130AB3C6003325EB /* RScriptEditorTokens.h in Headers */,
 				BC12DC4A130EC12900FB39CE /* NoodleLineNumberView.h in Headers */,
+				6825104D132F337800367C93 /* CCComp.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -938,7 +942,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 680F0B3A0997CE66009CDBE8 /* Build configuration list for PBXProject "R" */;
 			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -1780,8 +1783,8 @@
 				INFOPLIST_PREFIX_HEADER = InfoPlist.h;
 				INFOPLIST_PREPROCESS = YES;
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "DEBUG_CFG=1";
-				STRIP_INSTALLED_PRODUCT = NO;
 				STRINGS_FILE_OUTPUT_ENCODING = "UTF-8";
+				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Debug;
 		};

diff --git a/RController.h b/RController.h
@@ -37,7 +37,7 @@
 #include <R_ext/eventloop.h>
 #import <sys/types.h>
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import <WebKit/WebKit.h>
 
 #import "Tools/History.h"

diff --git a/RDocument.h b/RDocument.h
@@ -28,9 +28,8 @@
  */
 
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "Preferences.h"
-//#import "RDocumentWinCtrl.h"
 
 @class RDocumentWinCtrl;
 

diff --git a/RDocumentController.h b/RDocumentController.h
@@ -29,7 +29,7 @@
 
 /* RDocumentController */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "Preferences.h"
 #import "RDocument.h"
 

diff --git a/RDocumentWinCtrl.h b/RDocumentWinCtrl.h
@@ -29,7 +29,7 @@
  *  Created by Simon Urbanek on 1/11/05.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "Preferences.h"
 #import "RDocument.h"
 #import "RScriptEditorTextView.h"

diff --git a/REditor.h b/REditor.h
@@ -29,7 +29,7 @@
 
 /* REditor */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 #define DataEditorToolbarIdentifier      @"DataEditor Toolbar Identifier"
 #define AddColToolbarItemIdentifier      @"Add Column"

diff --git a/REditor.m b/REditor.m
@@ -38,18 +38,6 @@
 #include <Rinternals.h>
 #include <Rversion.h>
 
-/* for pre-10.5 compatibility */
-#ifndef NSINTEGER_DEFINED
-#if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
-#define NSINTEGER_DEFINED 1
-#endif
-
 #ifndef max
 #define max(x,y) x<y?y:x;
 #endif

diff --git a/REditorTextStorage.h b/REditorTextStorage.h
@@ -29,7 +29,7 @@
  *  Created by Simon Urbanek on 1/11/05.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "Preferences.h"
 
 @interface REditorTextStorage : NSTextStorage <PreferencesDependent> {

diff --git a/REditorToolbar.h b/REditorToolbar.h
@@ -32,7 +32,7 @@
  *  Created by Simon Urbanek on 4/1/05.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "RDocumentWinCtrl.h"
 
 #define	RETI_Save       @"RETI Save Document"

diff --git a/RRulerView.h b/RRulerView.h
@@ -31,7 +31,7 @@
  *  inspired by LineNumbering example authored by Koen van der Drift.
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "PreferenceKeys.h"
 #import "Preferences.h"
 

diff --git a/RScriptEditorTextView.h b/RScriptEditorTextView.h
@@ -32,7 +32,7 @@
  *
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import "RTextView.h"
 #import "Preferences.h"
 #import "PreferenceKeys.h"

diff --git a/RTextView.h b/RTextView.h
@@ -30,7 +30,7 @@
  *  $Id$
  */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 /* RTextView is a subclass of NSTextView with some additional properties:
    - responds to <Ctrl><.> by sending complete: to self

diff --git a/SearchTable.h b/SearchTable.h
@@ -29,7 +29,7 @@
 
 /* SearchTable */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 #import <WebKit/WebKit.h>
 #import <WebKit/WebFrame.h>
 #import "Tools/SortableDataSource.h"

diff --git a/SelectList.h b/SelectList.h
@@ -29,7 +29,7 @@
 
 /* SelectList */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 @interface SelectList : NSObject
 {

diff --git a/SelectList.m b/SelectList.m
@@ -30,18 +30,6 @@
 #import "RGUI.h"
 #import "SelectList.h"
 
-/* for pre-10.5 compatibility */
-#ifndef NSINTEGER_DEFINED
-#if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
-#define NSINTEGER_DEFINED 1
-#endif
-
 static SelectList *sharedController = nil;
 
 @implementation SelectList

diff --git a/Tools/SortableDataSource.h b/Tools/SortableDataSource.h
@@ -41,6 +41,18 @@ typedef unsigned int NSUInteger;
 #define NSINTEGER_DEFINED 1
 #endif
 
+@protocol NSTableViewDataSource <NSObject>
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView;
+- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
+@optional
+- (void)tableView:(NSTableView *)tableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row;
+- (void)tableView:(NSTableView *)tableView sortDescriptorsDidChange:(NSArray *)oldDescriptors;
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard;
+- (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation;
+- (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation;
+- (NSArray *)tableView:(NSTableView *)tableView namesOfPromisedFilesDroppedAtDestination:(NSURL *)dropDestination forDraggedRowsWithIndexes:(NSIndexSet *)indexSet;
+@end
+
 @interface SortableDataSource : NSObject <NSTableViewDataSource> {
     NSMutableArray *col;
     NSMutableArray *colNames;

diff --git a/VignettesController.h b/VignettesController.h
@@ -1,7 +1,7 @@
 /* VignettesController */
 
-#import <Cocoa/Cocoa.h>
 #import "RGUI.h"
+#import "CCComp.h"
 #import "Tools/SortableDataSource.h"
 #import "Tools/PDFImageView.h"
 

diff --git a/VignettesController.m b/VignettesController.m
@@ -3,18 +3,6 @@
 #import "REngine/REngine.h"
 #import "REngine/RSEXP.h"
 
-/* for pre-10.5 compatibility */
-#ifndef NSINTEGER_DEFINED
-#if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
-#define NSINTEGER_DEFINED 1
-#endif
-
 @implementation VignettesController
 
 static VignettesController *vignettesSharedController = nil;

diff --git a/WSBrowser.h b/WSBrowser.h
@@ -29,7 +29,7 @@
 
 /* WSBrowser */
 
-#import <Cocoa/Cocoa.h>
+#import "CCComp.h"
 
 #define WorkSpaceBrowserToolbarIdentifier      @"WorkSpaceBrowser Toolbar Identifier"
 

diff --git a/WSBrowser.m b/WSBrowser.m
@@ -53,18 +53,6 @@
 #define PROP_KEY @"property"
 #define CHILD_KEY @"children"
 
-/* for pre-10.5 compatibility */
-#ifndef NSINTEGER_DEFINED
-#if __LP64__ || NS_BUILD_32_LIKE_64
-typedef long NSInteger;
-typedef unsigned long NSUInteger;
-#else
-typedef int NSInteger;
-typedef unsigned int NSUInteger;
-#endif
-#define NSINTEGER_DEFINED 1
-#endif
-
 @implementation WSBrowser