gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 15:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace some occurences of int with NSInteger

Browse source 
and unsigned with NSUInteger. This allows to recompile gui on 
64 bit systems after the change to NSNotFound in base.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34312 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-12-17 17:16:09 +00:00
parent d648b7ca14
commit ccf59ac3ca
35 changed files with 248 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/NSButton.m
View file

@ -99,12 +99,12 @@ static id buttonCellClass = nil;
[self setNeedsDisplay: YES];
}
- (void)setHighlightsBy:(int)aType
- (void)setHighlightsBy:(NSInteger)aType
{
[_cell setHighlightsBy:aType];
}
- (void)setShowsStateBy:(int)aType
- (void)setShowsStateBy:(NSInteger)aType
{
[_cell setShowsStateBy:aType];
}
@ -130,7 +130,7 @@ static id buttonCellClass = nil;
/**<p>Sets the NSButtonCell's state to <var>value</var> and marks
self for display.</p><p>See Also: -state [NSButtonCell-setState:]</p>
*/
- (void) setState: (int)value
- (void) setState: (NSInteger)value
{
[_cell setState: value];
[self setNeedsDisplay: YES];
@ -139,7 +139,7 @@ static id buttonCellClass = nil;
/** <p>Returns the NSButtonCell's state.</p>
<p>See Also: -setState: [NSButtonCell-state]</p>
*/
- (int) state
- (NSInteger) state
{
return [_cell state];
}
@ -410,7 +410,7 @@ static id buttonCellClass = nil;
NSCommandKeyMask.</p><p>See Also: -setKeyEquivalentModifierMask:
-keyEquivalent [NSButtonCell-setKeyEquivalentModifierMask:]</p>
*/
- (unsigned int) keyEquivalentModifierMask
- (NSUInteger) keyEquivalentModifierMask
{
return [_cell keyEquivalentModifierMask];
}
@ -434,7 +434,7 @@ static id buttonCellClass = nil;
-setKeyEquivalent: -performKeyEquivalent:
[NSButtonCell-setKeyEquivalentModifierMask:]</p>
*/
- (void) setKeyEquivalentModifierMask: (unsigned int)mask
- (void) setKeyEquivalentModifierMask: (NSUInteger)mask
{
[_cell setKeyEquivalentModifierMask: mask];
}
@ -515,9 +515,9 @@ static id buttonCellClass = nil;
if ([keyEquivalent length] > 0 && [keyEquivalent isEqualToString: [anEvent charactersIgnoringModifiers]])
{
unsigned int mask = [self keyEquivalentModifierMask];
unsigned int modifiers = [anEvent modifierFlags];
unsigned int relevantModifiersMask = NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask;
NSUInteger mask = [self keyEquivalentModifierMask];
NSUInteger modifiers = [anEvent modifierFlags];
NSUInteger relevantModifiersMask = NSCommandKeyMask | NSAlternateKeyMask | NSControlKeyMask;
/* Take shift key into account only for control keys and arrow and function keys */
if ((modifiers & NSFunctionKeyMask)
|| [[NSCharacterSet controlCharacterSet] characterIsMember:[keyEquivalent characterAtIndex:0]])