gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 04:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Headers/AppKit/NSLayoutManager.h: Declarations for new methods

Browse source 
to handle temporary attributes.
	* Source/GSNibCompatibility.m: Corrections to nib loading logic.
	* Source/NSLayoutManager.m: Skeleton implementations of new
	methods to handle temporary attributes.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27124 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2008-11-23 23:54:00 +00:00
parent 4beecc0c17
commit 3efcd42dff
4 changed files with 74 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,11 @@
2008-11-23 18:56-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Headers/AppKit/NSLayoutManager.h: Declarations for new methods
to handle temporary attributes.
* Source/GSNibCompatibility.m: Corrections to nib loading logic.
* Source/NSLayoutManager.m: Skeleton implementations of new
methods to handle temporary attributes.
2008-11-23 Fred Kiefer <FredKiefer@gmx.de> 2008-11-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSControl.m (-initWithCoder:): For keyed decoding make * Source/NSControl.m (-initWithCoder:): For keyed decoding make
@ -25,6 +33,7 @@
* Source/NSTextView.m (-updateDragTypeRegistration): Register drag * Source/NSTextView.m (-updateDragTypeRegistration): Register drag
types for non-rich text NSTextViews, too. types for non-rich text NSTextViews, too.
>>>>>>> .r27123
2008-11-22 20:46-EST Gregory John Casamento <greg_casamento@yahoo.com> 2008-11-22 20:46-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/GSNibCompatibility.m: Further improvements to nib loading * Source/GSNibCompatibility.m: Further improvements to nib loading

11
Headers/AppKit/NSLayoutManager.h
View file

@ -183,6 +183,15 @@ GNUstep extension.
@end @end
@interface NSLayoutManager (temporaryattributes)
- (void) addTemporaryAttributes: (NSDictionary *)attrs forCharacterRange: (NSRange)range;
- (void) addTemporaryAttribute: (NSString *)attr value: (id)value forCharacterRange: (NSRange)range;
- (void) setTemporaryAttributes:forCharacterRange: (NSRange)range;
- (void) removeTemporaryAttribute: (NSString *)attr forCharacterRange: (NSRange)range;
- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range;
- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range;
- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range;
- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int) longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range;
@end
#endif #endif

12
Source/GSNibCompatibility.m
View file

@ -630,10 +630,16 @@ static BOOL _isInInterfaceBuilder = NO;
[NSException raise: NSInternalInconsistencyException [NSException raise: NSInternalInconsistencyException
format: @"Unable to find class '%@'", _className]; format: @"Unable to find class '%@'", _className];
} }
if(GSObjCIsKindOf(aClass, [NSApplication class]))
{
_object = [aClass sharedApplication];
}
else
{
_object = [[aClass allocWithZone: NSDefaultMallocZone()] init]; _object = [[aClass allocWithZone: NSDefaultMallocZone()] init];
} }
} }
}
else else
{ {
[NSException raise: NSInvalidArgumentException [NSException raise: NSInvalidArgumentException
@ -1072,7 +1078,7 @@ static BOOL _isInInterfaceBuilder = NO;
id menu = nil; id menu = nil;
// replace the owner with the actual instance provided. // replace the owner with the actual instance provided.
[_root setObject: owner]; [self setRoot: owner];
// iterate over connections, instantiate, and then establish them. // iterate over connections, instantiate, and then establish them.
while ((obj = [en nextObject]) != nil) while ((obj = [en nextObject]) != nil)
@ -1284,7 +1290,7 @@ static BOOL _isInInterfaceBuilder = NO;
{ {
if ([coder allowsKeyedCoding]) if ([coder allowsKeyedCoding])
{ {
ASSIGN(_root, [coder decodeObjectForKey: @"NSRoot"]); // ASSIGN(_root, [coder decodeObjectForKey: @"NSRoot"]);
ASSIGN(_visibleWindows, (NSMutableArray *)[coder decodeObjectForKey: @"NSVisibleWindows"]); ASSIGN(_visibleWindows, (NSMutableArray *)[coder decodeObjectForKey: @"NSVisibleWindows"]);
ASSIGN(_accessibilityConnectors, (NSMutableArray *)[coder decodeObjectForKey: @"NSAccessibilityConnectors"]); ASSIGN(_accessibilityConnectors, (NSMutableArray *)[coder decodeObjectForKey: @"NSAccessibilityConnectors"]);
ASSIGN(_fontManager, [coder decodeObjectForKey: @"NSFontManager"]); ASSIGN(_fontManager, [coder decodeObjectForKey: @"NSFontManager"]);

45
Source/NSLayoutManager.m
View file

@ -2291,3 +2291,48 @@ no_soft_invalidation:
@end @end
@implementation NSLayoutManager (temporaryattributes)
- (void) addTemporaryAttributes: (NSDictionary *)attrs forCharacterRange: (NSRange)range
{
// to be implemented
}
- (void) addTemporaryAttribute: (NSString *)attr value: (id)value forCharacterRange: (NSRange)range
{
// to be implemented
}
- (void) setTemporaryAttributes:forCharacterRange: (NSRange)range
{
// to be implemented
}
- (void) removeTemporaryAttribute: (NSString *)attr forCharacterRange: (NSRange)range
{
// to be implemented
}
- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range
{
// to be implemented
return nil;
}
- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range
{
// to be implemented
return nil;
}
- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range
{
// to be implemented
return nil;
}
- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int) longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range
{
// to be implemented
return nil;
}
@end