Remove a few compiler warnings.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@31587 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2010-11-03 20:26:30 +00:00
parent b8abcc62ea
commit 49fdc602ba
5 changed files with 23 additions and 13 deletions

View file

@ -1,3 +1,13 @@
2010-11-03 Fred Kiefer <FredKiefer@gmx.de>
* Headers/Additions/GNUstepGUI/GSTheme.h: Add method
doesProcessEventsForPopUpMenu to avoid compiler warnings.
* Headers/AppKit/NSLayoutManager.h,
* Source/NSLayoutManager.m: Change a few "unsigned int" into
NSUInteger to avoid compiler warnings.
* Source/NSTextView.m (firstRectForCharacterRange:): Adopt to
these changes.
2010-11-03 Fred Kiefer <FredKiefer@gmx.de> 2010-11-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSWindow.m (-validRequestorForSendType:returnType:): * Source/NSWindow.m (-validRequestorForSendType:returnType:):

View file

@ -1069,6 +1069,7 @@ withRepeatedImage: (NSImage*)image
controlViewWindow: (NSWindow *)cvWin controlViewWindow: (NSWindow *)cvWin
preferredEdge: (NSRectEdge)edge preferredEdge: (NSRectEdge)edge
selectedItem: (int)selectedItem; selectedItem: (int)selectedItem;
- (BOOL) doesProcessEventsForPopUpMenu;
/** /**
* Processes menu events for the theme. The default implementation * Processes menu events for the theme. The default implementation

View file

@ -97,17 +97,17 @@ typedef enum {
- (void) textContainerChangedTextView: (NSTextContainer *)aContainer; - (void) textContainerChangedTextView: (NSTextContainer *)aContainer;
- (NSPoint) locationForGlyphAtIndex: (unsigned int)glyphIndex; - (NSPoint) locationForGlyphAtIndex: (NSUInteger)glyphIndex;
- (NSRect *) rectArrayForGlyphRange: (NSRange)glyphRange - (NSRect *) rectArrayForGlyphRange: (NSRange)glyphRange
withinSelectedGlyphRange: (NSRange)selGlyphRange withinSelectedGlyphRange: (NSRange)selGlyphRange
inTextContainer: (NSTextContainer *)container inTextContainer: (NSTextContainer *)container
rectCount: (unsigned int *)rectCount; rectCount: (NSUInteger *)rectCount;
- (NSRect *) rectArrayForCharacterRange: (NSRange)charRange - (NSRect *) rectArrayForCharacterRange: (NSRange)charRange
withinSelectedCharacterRange: (NSRange)selCharRange withinSelectedCharacterRange: (NSRange)selCharRange
inTextContainer: (NSTextContainer *)container inTextContainer: (NSTextContainer *)container
rectCount: (unsigned int *)rectCount; rectCount: (NSUInteger *)rectCount;
- (NSRect) boundingRectForGlyphRange: (NSRange)glyphRange - (NSRect) boundingRectForGlyphRange: (NSRange)glyphRange
inTextContainer: (NSTextContainer *)aTextContainer; inTextContainer: (NSTextContainer *)aTextContainer;

View file

@ -157,12 +157,12 @@ first. Remaining cases, highest priority first:
@implementation NSLayoutManager (layout) @implementation NSLayoutManager (layout)
-(NSPoint) locationForGlyphAtIndex: (unsigned int)glyphIndex -(NSPoint) locationForGlyphAtIndex: (NSUInteger)glyphIndex
{ {
NSRange r; NSRange r;
NSPoint p; NSPoint p;
NSFont *f; NSFont *f;
unsigned int i; NSUInteger i;
r = [self rangeOfNominallySpacedGlyphsContainingIndex: glyphIndex r = [self rangeOfNominallySpacedGlyphsContainingIndex: glyphIndex
startLocation: &p]; startLocation: &p];
@ -213,9 +213,9 @@ container? necessary? */
-(NSRect *) rectArrayForGlyphRange: (NSRange)glyphRange -(NSRect *) rectArrayForGlyphRange: (NSRange)glyphRange
withinSelectedGlyphRange: (NSRange)selGlyphRange withinSelectedGlyphRange: (NSRange)selGlyphRange
inTextContainer: (NSTextContainer *)container inTextContainer: (NSTextContainer *)container
rectCount: (unsigned int *)rectCount rectCount: (NSUInteger *)rectCount
{ {
unsigned int last; NSUInteger last;
int i; int i;
textcontainer_t *tc; textcontainer_t *tc;
linefrag_t *lf; linefrag_t *lf;
@ -223,7 +223,6 @@ container? necessary? */
float x0, x1; float x0, x1;
NSRect r; NSRect r;
*rectCount = 0; *rectCount = 0;
for (tc = textcontainers, i = 0; i < num_textcontainers; i++, tc++) for (tc = textcontainers, i = 0; i < num_textcontainers; i++, tc++)
@ -320,7 +319,7 @@ container? necessary? */
The end index is inside the line frag, so we need to find the The end index is inside the line frag, so we need to find the
exact end location. exact end location.
*/ */
unsigned int i; NSUInteger i;
int j; int j;
linefrag_point_t *lp; linefrag_point_t *lp;
glyph_run_t *r; glyph_run_t *r;
@ -400,7 +399,7 @@ container? necessary? */
-(NSRect *) rectArrayForCharacterRange: (NSRange)charRange -(NSRect *) rectArrayForCharacterRange: (NSRange)charRange
withinSelectedCharacterRange: (NSRange)selCharRange withinSelectedCharacterRange: (NSRange)selCharRange
inTextContainer: (NSTextContainer *)container inTextContainer: (NSTextContainer *)container
rectCount: (unsigned int *)rectCount rectCount: (NSUInteger *)rectCount
{ {
NSRange r1, r2; NSRange r1, r2;
@ -422,7 +421,7 @@ container? necessary? */
{ {
NSRect *r; NSRect *r;
NSRect result; NSRect result;
unsigned int i, c; NSUInteger i, c;
/* TODO: This isn't correct. Need to handle glyphs that extend outside the /* TODO: This isn't correct. Need to handle glyphs that extend outside the
line frag rect. */ line frag rect. */
@ -1161,7 +1160,7 @@ container
unsigned int glyph_pos, char_pos, first_char_pos; unsigned int glyph_pos, char_pos, first_char_pos;
int i, j; int i, j;
NSRect *rects; NSRect *rects;
unsigned int count; NSUInteger count;
NSColor *color, *last_color; NSColor *color, *last_color;
NSGraphicsContext *ctxt = GSCurrentContext(); NSGraphicsContext *ctxt = GSCurrentContext();

View file

@ -1997,7 +1997,7 @@ here. */
- (NSRect) firstRectForCharacterRange: (NSRange)theRange - (NSRect) firstRectForCharacterRange: (NSRange)theRange
{ {
unsigned int rectCount = 0; NSUInteger rectCount = 0;
NSRect *rects; NSRect *rects;
if (!_layoutManager) if (!_layoutManager)