- Fixed Info.plist path in Darwin target in ApplicationServices.xcodeproj

- Added ApplicationServices as dependancy for Darwin AppKit target
- Added characterIndexForPoint: to NSTextInput protocol
- NSFontDescription matchingFontDescriptorsWithMandatoryKeys:, matchingFontDescriptorWithMandatoryKeys: stubs
- NSResponder.h moveRightAndModifySelection:,moveLeftAndModifySelection:,moveWordRightAndModifySelection:, moveWordLeftAndModifySelection:,moveWordRight:,moveWordLeft:,
- NSTextView dragOperationForDraggingInfo:, cleanUpAfterDragOperation stubs
- NSPropertyListReader_vintage +initialize had wrong return type
This commit is contained in:
Christopher Lloyd 2009-01-26 02:26:32 +00:00
parent 122f53c6c3
commit 4be46ae995
9 changed files with 56 additions and 5 deletions

View File

@ -2288,6 +2288,13 @@
remoteGlobalIDString = FE01A5970C5D9B6900AEA51A;
remoteInfo = "Foundation-Windows-i386";
};
FE07750C0F2D54470074EE75 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FECAF4C80DB710EE00BA2A8E /* ApplicationServices.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = C8A2E2710F07E9B70054397C;
remoteInfo = "ApplicationServices-Darwin-i386";
};
FE6EDEBC0DB7AF94005503A1 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = FECAF4C80DB710EE00BA2A8E /* ApplicationServices.xcodeproj */;
@ -5339,6 +5346,7 @@
);
dependencies = (
C8A2E5760F07EA440054397C /* PBXTargetDependency */,
FE07750D0F2D54470074EE75 /* PBXTargetDependency */,
);
name = "AppKit-Darwin-i386";
productInstallPath = /Library/Frameworks;
@ -6676,6 +6684,11 @@
name = "Foundation-Windows-i386";
targetProxy = FE01AACB0C5D9BE700AEA51A /* PBXContainerItemProxy */;
};
FE07750D0F2D54470074EE75 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "ApplicationServices-Darwin-i386";
targetProxy = FE07750C0F2D54470074EE75 /* PBXContainerItemProxy */;
};
FE6EDEBD0DB7AF94005503A1 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "ApplicationServices-Windows-i386";

View File

@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSObject.h>
#import <AppKit/AppKitExport.h>
@class NSDictionary,NSAffineTransform;
@class NSDictionary,NSAffineTransform,NSArray,NSSet;
APPKIT_EXPORT NSString *NSFontNameAttribute;
APPKIT_EXPORT NSString *NSFontFamilyAttribute;
@ -47,4 +47,7 @@ typedef unsigned NSFontSymbolicTraits;
-(NSFontDescriptor *)fontDescriptorWithSize:(float)pointSize;
-(NSFontDescriptor *)fontDescriptorWithSymbolicTraits:(NSFontSymbolicTraits)traits;
-(NSArray *)matchingFontDescriptorsWithMandatoryKeys:(NSSet *)keys;
-(NSFontDescriptor *)matchingFontDescriptorWithMandatoryKeys:(NSSet *)keys;
@end

View File

@ -9,6 +9,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <Foundation/NSString.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSNumber.h>
#import <Foundation/NSRaise.h>
NSString *NSFontNameAttribute=@"NSFontNameAttribute";
NSString *NSFontFamilyAttribute=@"NSFontFamilyAttribute";
@ -126,4 +127,14 @@ NSString *NSFontVisibleNameAttribute=@"NSFontVisibleNameAttribute";
return [isa fontDescriptorWithFontAttributes:copy];
}
-(NSArray *)matchingFontDescriptorsWithMandatoryKeys:(NSSet *)keys {
NSUnimplementedMethod();
return nil;
}
-(NSFontDescriptor *)matchingFontDescriptorWithMandatoryKeys:(NSSet *)keys {
NSUnimplementedMethod();
return nil;
}
@end

View File

@ -103,9 +103,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(void)moveForwardAndModifySelection:sender;
-(void)moveBackwardAndModifySelection:sender;
-(void)moveRightAndModifySelection:sender;
-(void)moveLeftAndModifySelection:sender;
-(void)moveWordForwardAndModifySelection:sender;
-(void)moveWordBackwardAndModifySelection:sender;
-(void)moveWordRightAndModifySelection:sender;
-(void)moveWordLeftAndModifySelection:sender;
-(void)moveUp:sender;
-(void)moveDown:sender;
@ -116,6 +120,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
-(void)moveWordForward:sender;
-(void)moveWordBackward:sender;
-(void)moveWordRight:sender;
-(void)moveWordLeft:sender;
-(void)moveToBeginningOfLine:sender;
-(void)moveToEndOfLine:sender;

View File

@ -10,4 +10,5 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@protocol NSTextInput
-(NSRect)firstRectForCharacterRange:(NSRange)range;
-(NSUInteger)characterIndexForPoint:(NSPoint)point;
@end

View File

@ -8,6 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
#import <AppKit/NSText.h>
#import <AppKit/NSTextInput.h>
#import <AppKit/NSDragging.h>
@class NSTextStorage, NSLayoutManager, NSTextContainer, NSUndoManager;
@class NSRulerView, NSRulerMarker;
@ -157,6 +158,9 @@ APPKIT_EXPORT NSString *NSOldSelectedCharacterRange;
-(void)pageUp:sender;
-(void)pageDown:sender;
-(NSDragOperation)dragOperationForDraggingInfo:(id <NSDraggingInfo>)info type:(NSString *)type;
-(void)cleanUpAfterDragOperation;
@end
@interface NSObject(NSTextView_undoManager)

View File

@ -2257,4 +2257,18 @@ NSString *NSOldSelectedCharacterRange=@"NSOldSelectedCharacterRange";
return [self _viewRectForCharacterRange:range];
}
-(NSDragOperation)dragOperationForDraggingInfo:(id <NSDraggingInfo>)info type:(NSString *)type {
NSUnimplementedMethod();
return 0;
}
-(void)cleanUpAfterDragOperation {
NSUnimplementedMethod();
}
-(NSUInteger)characterIndexForPoint:(NSPoint)point {
NSUnimplementedMethod();
return 0;
}
@end

View File

@ -609,7 +609,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = /Users/jobi/Projekte/cocotron/ApplicationServices/Info.plist;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Developer/Cocotron/1.0/Darwin/i386/Frameworks;
OTHER_CFLAGS = (
"-DAPPLICATIONSERVICES_INSIDE_BUILD",

View File

@ -6,7 +6,6 @@ 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. */
// Original - Christopher Lloyd <cjwl@objc.net>
#import <Foundation/NSPropertyListReader_vintage.h>
#import <Foundation/NSData.h>
#import <Foundation/NSString.h>
@ -22,8 +21,7 @@ static Class NSMutableArrayClass=nil;
@implementation NSPropertyListReader_vintage
+initialize
{
+(void)initialize {
if(self==[NSPropertyListReader_vintage class])
{
NSStringClass=[NSString class];