diff --git a/ChangeLog b/ChangeLog index f053af4c5..98a5dab56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ * Documentation/GNUmakefile.postamble: Tweak for make update. * Source/DocMakefile: ditto + * Headers/gnustep/gui/NSLayoutManager.h: documentation tweaks. + * Headers/gnustep/gui/NSRulerMarker.h: ditto + * Headers/gnustep/gui/NSText.h: ditto + * Headers/gnustep/gui/NSTextContainer.h: ditto + * Source/NSLayoutManager.m: ditto + * Source/NSPopUpButtonCell.m: ditto + * Source/NSTextContainer.m: ditto + * Source/NSWorkspace.m: ditto 2003-07-22 Andrew Ruder diff --git a/Headers/gnustep/gui/NSLayoutManager.h b/Headers/gnustep/gui/NSLayoutManager.h index 6b0beb3dc..bc91ef465 100644 --- a/Headers/gnustep/gui/NSLayoutManager.h +++ b/Headers/gnustep/gui/NSLayoutManager.h @@ -76,8 +76,8 @@ typedef enum { - (BOOL) layoutManagerOwnsFirstResponderInWindow: (NSWindow *)window; -(NSArray *) rulerMarkersForTextView: (NSTextView *)textView - paragraphStyle: (NSParagraphStyle *)style - ruler: (NSRulerView *)ruler; + paragraphStyle: (NSParagraphStyle *)paragraphStyle + ruler: (NSRulerView *)aRulerView; -(NSView *) rulerAccessoryViewForTextView: (NSTextView *)textView paragraphStyle: (NSParagraphStyle *)style ruler: (NSRulerView *)ruler diff --git a/Headers/gnustep/gui/NSRulerMarker.h b/Headers/gnustep/gui/NSRulerMarker.h index 40298c472..dcb7303ee 100644 --- a/Headers/gnustep/gui/NSRulerMarker.h +++ b/Headers/gnustep/gui/NSRulerMarker.h @@ -77,7 +77,7 @@ - (void)drawRect:(NSRect)aRect; - (BOOL)isDragging; -- (BOOL)trackMouse:(NSEvent *)theEvent adding:(BOOL)flag; +- (BOOL)trackMouse:(NSEvent *)theEvent adding:(BOOL)adding; @end diff --git a/Headers/gnustep/gui/NSText.h b/Headers/gnustep/gui/NSText.h index d3b83c2cd..424a43f8e 100644 --- a/Headers/gnustep/gui/NSText.h +++ b/Headers/gnustep/gui/NSText.h @@ -125,7 +125,7 @@ enum { withString: (NSString*)aString; /* PRIMITIVE */ -(void) replaceCharactersInRange: (NSRange)aRange /* GNUstep extension */ - withAttributedString: (NSAttributedString *)aString; + withAttributedString: (NSAttributedString *)attrString; /* PRIMITIVE */ - (void) setString: (NSString*)aString; /* PRIMITIVE */ diff --git a/Headers/gnustep/gui/NSTextContainer.h b/Headers/gnustep/gui/NSTextContainer.h index 8b5778653..0e44df08d 100644 --- a/Headers/gnustep/gui/NSTextContainer.h +++ b/Headers/gnustep/gui/NSTextContainer.h @@ -108,7 +108,7 @@ Initializes a new instance and sets the container size to aSize. /** -Querying the region +Querying the region */ /** @@ -176,7 +176,7 @@ Subclasses define regions by overriding this method. /** -Managing the text network +Managing the text network
A text container may be attached to one layout manager and one text view. The text container is retained by the layout manager, and retains the text @@ -220,7 +220,7 @@ none. /** -The container size +The container size
A text container has a container size. The region defined by the text container must be a subset of the rectangle of this size with it's top-left @@ -235,7 +235,7 @@ must be valid. /** -Automatic resizing +Automatic resizing
A text container can be set to automatically track the width and/or height of its NSTextView (TODO: frame? bounds?). For more information, see the @@ -252,7 +252,7 @@ is resized. /** -Line fragment padding +Line fragment padding
The line fragment padding is an amount of space left empty at each end of a line fragment rectangle by the standard typesetter. The default is 0.0. diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m index 4e6d7136f..5ac40d20f 100644 --- a/Source/NSLayoutManager.m +++ b/Source/NSLayoutManager.m @@ -892,7 +892,7 @@ has the same y origin and height as the line frag rect it is in. -(unsigned int) characterIndexMoving: (GSInsertionPointMovementDirection)direction fromCharacterIndex: (unsigned int)from originalCharacterIndex: (unsigned int)original - distance: (float)distance; + distance: (float)distance { NSRect from_rect, new_rect; int from_tc, new_tc; diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m index 9d2444fb1..5445ed420 100644 --- a/Source/NSPopUpButtonCell.m +++ b/Source/NSPopUpButtonCell.m @@ -314,7 +314,7 @@ static NSImage *_pbc_image[2]; } } -- (void)setImage:(NSImage *)anImage; +- (void)setImage:(NSImage *)anImage { // Do nothing as the image is determined by the current item } diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m index fe1df47f6..41519bb5d 100644 --- a/Source/NSTextContainer.m +++ b/Source/NSTextContainer.m @@ -318,33 +318,32 @@ framework intact. return _lineFragmentPadding; } --(NSRect) lineFragmentRectForProposedRect: (NSRect)proposed - sweepDirection: (NSLineSweepDirection)sweep - movementDirection: (NSLineMovementDirection)move - remainingRect: (NSRect *)remain +- (NSRect) lineFragmentRectForProposedRect: (NSRect)proposedRect + sweepDirection: (NSLineSweepDirection)sweepDir + movementDirection: (NSLineMovementDirection)moveDir + remainingRect: (NSRect *)remainingRect { float minx, maxx, miny, maxy; float cminx, cmaxx, cminy, cmaxy; - minx = NSMinX(proposed); - maxx = NSMaxX(proposed); - miny = NSMinY(proposed); - maxy = NSMaxY(proposed); + minx = NSMinX(proposedRect); + maxx = NSMaxX(proposedRect); + miny = NSMinY(proposedRect); + maxy = NSMaxY(proposedRect); cminx = NSMinX(_containerRect); cmaxx = NSMaxX(_containerRect); cminy = NSMinY(_containerRect); cmaxy = NSMaxY(_containerRect); - *remain = NSZeroRect; + *remainingRect = NSZeroRect; - if (minx >= cminx && maxx <= cmaxx && - miny >= cminy && maxy <= cmaxy) + if (minx >= cminx && maxx <= cmaxx && miny >= cminy && maxy <= cmaxy) { - return proposed; + return proposedRect; } - switch (move) + switch (moveDir) { case NSLineMoveLeft: if (maxx < cminx) @@ -390,7 +389,7 @@ framework intact. break; } - switch (sweep) + switch (sweepDir) { case NSLineSweepLeft: case NSLineSweepRight: diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m index 6086dcccb..d56d0b131 100644 --- a/Source/NSWorkspace.m +++ b/Source/NSWorkspace.m @@ -1130,7 +1130,7 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath * to it using [NSConnection+rootProxyForConnectionWithRegisteredName:host:] * passing the application name (normally the filesystem name excluding path * and file extension) and an empty host name. This will let you communicate - * with the the [NSApplication-delagate] of the launched application, and you + * with the the [NSApplication-delegate] of the launched application, and you * can generally use this as a test of whether an application is running * correctly. *