mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
First set of NSInteger/NSUInteger cleanup in gui.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36029 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer
parent
ec2f64f7a9
commit
a612305757
15 changed files with 175 additions and 158 deletions
18
ChangeLog
18
ChangeLog
|
|
@ -1,3 +1,21 @@
|
|||
2013-01-27 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* gui/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
|
||||
* gui/Headers/AppKit/NSActionCell.h
|
||||
* gui/Headers/AppKit/NSAlert.h
|
||||
* gui/Headers/AppKit/NSGraphics.h
|
||||
* gui/Headers/AppKit/NSPanel.h
|
||||
* gui/Headers/AppKit/NSWindow.h
|
||||
* gui/Source/GSStandardWindowDecorationView.m
|
||||
* gui/Source/GSToolTips.m
|
||||
* gui/Source/GSWindowDecorationView.m
|
||||
* gui/Source/NSActionCell.m
|
||||
* gui/Source/NSAlert.m
|
||||
* gui/Source/NSDrawer.m
|
||||
* gui/Source/NSPanel.m
|
||||
* gui/Source/NSWindow.m: First set of NSInteger/NSUInteger cleanup
|
||||
in gui.
|
||||
|
||||
2013-01-27 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSTextContainer.m (lineFragmentRectForProposedRect:...):
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@
|
|||
- (id) newWindowDecorationViewWithFrame: (NSRect)frame
|
||||
window: (NSWindow *)window;
|
||||
- (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
- (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
- (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
@end
|
||||
|
||||
|
||||
|
|
@ -65,9 +65,9 @@ this, either directly, or indirectly (by using the backend).
|
|||
- (id) initWithFrame: (NSRect)frame window: (NSWindow *)w;
|
||||
|
||||
- (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
- (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
|
||||
- (void) layout;
|
||||
- (void) changeWindowHeight: (float)difference;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
@interface NSActionCell : NSCell
|
||||
{
|
||||
// Attributes
|
||||
int _tag;
|
||||
NSInteger _tag;
|
||||
id _target;
|
||||
SEL _action;
|
||||
NSView *_control_view;
|
||||
|
|
|
|||
|
|
@ -42,11 +42,12 @@
|
|||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
|
||||
|
||||
typedef enum _NSAlertStyle {
|
||||
enum _NSAlertStyle {
|
||||
NSWarningAlertStyle = 0,
|
||||
NSInformationalAlertStyle = 1,
|
||||
NSCriticalAlertStyle = 2
|
||||
} NSAlertStyle;
|
||||
};
|
||||
typedef NSUInteger NSAlertStyle;
|
||||
|
||||
enum {
|
||||
NSAlertFirstButtonReturn = 1000,
|
||||
|
|
@ -68,7 +69,7 @@ enum {
|
|||
BOOL _shows_help;
|
||||
id _modalDelegate;
|
||||
SEL _didEndSelector;
|
||||
int _result;
|
||||
NSInteger _result;
|
||||
}
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
|
||||
|
|
@ -93,7 +94,7 @@ enum {
|
|||
- (NSImage *) icon;
|
||||
- (NSString *) informativeText;
|
||||
- (NSString *) messageText;
|
||||
- (int) runModal;
|
||||
- (NSInteger) runModal;
|
||||
- (void) setAlertStyle: (NSAlertStyle)style;
|
||||
- (void) setDelegate: (id)delegate;
|
||||
- (void) setHelpAnchor: (NSString *)anchor;
|
||||
|
|
|
|||
|
|
@ -113,8 +113,8 @@ APPKIT_EXPORT BOOL NSPlanarFromDepth(NSWindowDepth depth);
|
|||
/*
|
||||
* Functions for getting information about windows.
|
||||
*/
|
||||
APPKIT_EXPORT void NSCountWindows(int *count);
|
||||
APPKIT_EXPORT void NSWindowList(int size, int list[]);
|
||||
APPKIT_EXPORT void NSCountWindows(NSInteger *count);
|
||||
APPKIT_EXPORT void NSWindowList(NSInteger size, NSInteger list[]);
|
||||
|
||||
APPKIT_EXPORT void NSEraseRect(NSRect aRect);
|
||||
APPKIT_EXPORT void NSHighlightRect(NSRect aRect);
|
||||
|
|
@ -220,7 +220,7 @@ GSWViewIsFlipped(NSGraphicsContext *ctxt)
|
|||
|
||||
APPKIT_EXPORT NSArray* GSOrderedWindows(void);
|
||||
APPKIT_EXPORT NSArray* GSAllWindows(void);
|
||||
APPKIT_EXPORT NSWindow* GSWindowWithNumber(int num);
|
||||
APPKIT_EXPORT NSWindow* GSWindowWithNumber(NSInteger num);
|
||||
#endif
|
||||
|
||||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
|
|
|
|||
|
|
@ -116,33 +116,33 @@ APPKIT_EXPORT id NSGetInformationalAlertPanel(NSString *title,
|
|||
//
|
||||
// Create and Run an Attention Panel
|
||||
//
|
||||
APPKIT_EXPORT int NSRunAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
APPKIT_EXPORT NSInteger NSRunAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
|
||||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
APPKIT_EXPORT int NSRunCriticalAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
APPKIT_EXPORT NSInteger NSRunCriticalAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
|
||||
APPKIT_EXPORT int NSRunInformationalAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
APPKIT_EXPORT NSInteger NSRunInformationalAlertPanel(NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
#endif
|
||||
|
||||
#if OS_API_VERSION(GS_API_ONE, GS_API_ONE)
|
||||
APPKIT_EXPORT int NSRunLocalizedAlertPanel(NSString *table,
|
||||
NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
APPKIT_EXPORT NSInteger NSRunLocalizedAlertPanel(NSString *table,
|
||||
NSString *title,
|
||||
NSString *msg,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton, ...);
|
||||
#endif
|
||||
|
||||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
|
|
@ -182,11 +182,11 @@ APPKIT_EXPORT void NSBeginInformationalAlertSheet(NSString *title,
|
|||
void *contextInfo,
|
||||
NSString *msg, ...);
|
||||
|
||||
APPKIT_EXPORT int GSRunExceptionPanel(NSString *title,
|
||||
NSException *exception,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton);
|
||||
APPKIT_EXPORT NSInteger GSRunExceptionPanel(NSString *title,
|
||||
NSException *exception,
|
||||
NSString *defaultButton,
|
||||
NSString *alternateButton,
|
||||
NSString *otherButton);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -179,9 +179,9 @@ PACKAGE_SCOPE
|
|||
id _lastRightMouseDownView;
|
||||
id _lastOtherMouseDownView;
|
||||
id _lastDragView;
|
||||
int _lastDragOperationMask;
|
||||
int _windowNum;
|
||||
int _gstate;
|
||||
NSInteger _lastDragOperationMask;
|
||||
NSInteger _windowNum;
|
||||
NSInteger _gstate;
|
||||
id _defaultButtonCell;
|
||||
NSGraphicsContext *_context;
|
||||
|
||||
|
|
@ -195,8 +195,8 @@ PACKAGE_SCOPE
|
|||
NSPoint _lastPoint;
|
||||
@protected
|
||||
NSBackingStoreType _backingType;
|
||||
unsigned _styleMask;
|
||||
int _windowLevel;
|
||||
NSUInteger _styleMask;
|
||||
NSInteger _windowLevel;
|
||||
PACKAGE_SCOPE
|
||||
NSRect _rectNeedingFlush;
|
||||
NSMutableArray *_rectsBeingDrawn;
|
||||
|
|
@ -205,7 +205,7 @@ PACKAGE_SCOPE
|
|||
|
||||
NSWindowDepth _depthLimit;
|
||||
NSWindowController *_windowController;
|
||||
int _counterpart;
|
||||
NSInteger _counterpart;
|
||||
float _alphaValue;
|
||||
|
||||
NSMutableArray *_children;
|
||||
|
|
@ -276,7 +276,7 @@ PACKAGE_SCOPE
|
|||
* Both rectangles are expressed in screen coordinates.
|
||||
*/
|
||||
+ (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
|
||||
/**
|
||||
* Returns the rectangle which would be used for the on-screen frame of
|
||||
|
|
@ -285,7 +285,7 @@ PACKAGE_SCOPE
|
|||
* Both rectangles are expressed in screen coordinates.
|
||||
*/
|
||||
+ (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
|
||||
/**
|
||||
* Returns the smallest frame width that will fit the given title
|
||||
|
|
@ -293,7 +293,7 @@ PACKAGE_SCOPE
|
|||
* decorations.
|
||||
*/
|
||||
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle;
|
||||
styleMask: (NSUInteger)aStyle;
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
|
||||
- (NSRect) contentRectForFrameRect: (NSRect)frameRect;
|
||||
|
|
@ -303,7 +303,7 @@ PACKAGE_SCOPE
|
|||
* Initializing and getting a new NSWindow object
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag;
|
||||
|
||||
|
|
@ -314,7 +314,7 @@ PACKAGE_SCOPE
|
|||
* the window style mask.
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
screen: (NSScreen*)aScreen;
|
||||
|
|
@ -380,7 +380,7 @@ PACKAGE_SCOPE
|
|||
- (NSPoint) cascadeTopLeftFromPoint: (NSPoint)topLeftPoint;
|
||||
|
||||
- (void) center;
|
||||
- (int) resizeFlags;
|
||||
- (NSInteger) resizeFlags;
|
||||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
- (void) setFrame: (NSRect)frameRect
|
||||
display: (BOOL)displayFlag
|
||||
|
|
@ -446,10 +446,10 @@ PACKAGE_SCOPE
|
|||
- (void) orderFrontRegardless;
|
||||
- (void) orderOut: (id)sender;
|
||||
- (void) orderWindow: (NSWindowOrderingMode)place
|
||||
relativeTo: (int)otherWin;
|
||||
relativeTo: (NSInteger)otherWin;
|
||||
- (BOOL) isVisible;
|
||||
- (int) level;
|
||||
- (void) setLevel: (int)newLevel;
|
||||
- (NSInteger) level;
|
||||
- (void) setLevel: (NSInteger)newLevel;
|
||||
|
||||
- (void) becomeKeyWindow;
|
||||
- (void) becomeMainWindow;
|
||||
|
|
@ -497,8 +497,8 @@ PACKAGE_SCOPE
|
|||
/*
|
||||
* Window device attributes
|
||||
*/
|
||||
- (int) windowNumber;
|
||||
- (int) gState;
|
||||
- (NSInteger) windowNumber;
|
||||
- (NSInteger) gState;
|
||||
- (NSDictionary*) deviceDescription;
|
||||
- (NSBackingStoreType) backingType;
|
||||
- (void) setBackingType: (NSBackingStoreType)type;
|
||||
|
|
@ -547,12 +547,12 @@ PACKAGE_SCOPE
|
|||
* Aiding event handling
|
||||
*/
|
||||
- (NSEvent*) currentEvent;
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask;
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
|
||||
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask;
|
||||
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask
|
||||
untilDate: (NSDate*)expiration
|
||||
inMode: (NSString*)mode
|
||||
dequeue: (BOOL)deqFlag;
|
||||
- (void) discardEventsMatchingMask: (unsigned int)mask
|
||||
- (void) discardEventsMatchingMask: (NSUInteger)mask
|
||||
beforeEvent: (NSEvent*)lastEvent;
|
||||
- (void) postEvent: (NSEvent*)event
|
||||
atStart: (BOOL)flag;
|
||||
|
|
@ -673,7 +673,7 @@ PACKAGE_SCOPE
|
|||
- (void) setContentView: (NSView*)aView;
|
||||
- (void) setBackgroundColor: (NSColor*)color;
|
||||
- (NSColor*) backgroundColor;
|
||||
- (unsigned int) styleMask;
|
||||
- (NSUInteger) styleMask;
|
||||
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
|
||||
- (void) setHasShadow: (BOOL)hasShadow;
|
||||
- (BOOL) hasShadow;
|
||||
|
|
@ -726,7 +726,7 @@ PACKAGE_SCOPE
|
|||
*/
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
|
||||
+ (NSButton *) standardWindowButton: (NSWindowButton)button
|
||||
forStyleMask: (unsigned int) mask;
|
||||
forStyleMask: (NSUInteger) mask;
|
||||
- (NSButton *) standardWindowButton: (NSWindowButton)button;
|
||||
#endif
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
@implementation GSStandardWindowDecorationView
|
||||
|
||||
+ (void) offsets: (float *)l : (float *)r : (float *)t : (float *)b
|
||||
forStyleMask: (unsigned int)style
|
||||
forStyleMask: (NSUInteger)style
|
||||
{
|
||||
GSTheme *theme = [GSTheme theme];
|
||||
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
}
|
||||
|
||||
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
float l, r, t, b, width;
|
||||
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
- (id) initWithFrame: (NSRect)frame
|
||||
window: (NSWindow *)w
|
||||
{
|
||||
unsigned int styleMask;
|
||||
NSUInteger styleMask;
|
||||
|
||||
self = [super initWithFrame: frame window: w];
|
||||
if (!self) return nil;
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
|
||||
- (void) moveWindowStartingWithEvent: (NSEvent *)event
|
||||
{
|
||||
unsigned int mask = NSLeftMouseDraggedMask | NSLeftMouseUpMask;
|
||||
NSUInteger mask = NSLeftMouseDraggedMask | NSLeftMouseUpMask;
|
||||
NSEvent *currentEvent = event;
|
||||
NSDate *distantPast = [NSDate distantPast];
|
||||
NSPoint delta, point;
|
||||
|
|
@ -303,7 +303,7 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
|
|||
|
||||
- (void) resizeWindowStartingWithEvent: (NSEvent *)event
|
||||
{
|
||||
unsigned int mask = NSLeftMouseDraggedMask | NSLeftMouseUpMask | NSPeriodicMask;
|
||||
NSUInteger mask = NSLeftMouseDraggedMask | NSLeftMouseUpMask | NSPeriodicMask;
|
||||
NSEvent *currentEvent = event;
|
||||
NSDate *distantPast = [NSDate distantPast];
|
||||
NSDate *distantFuture = [NSDate distantFuture];
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
@implementation GSTTPanel
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag;
|
||||
{
|
||||
|
|
|
|||
|
|
@ -80,13 +80,13 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
|
||||
|
||||
+ (void) offsets: (float *)l : (float *)r : (float *)t : (float *)b
|
||||
forStyleMask: (unsigned int)style
|
||||
forStyleMask: (NSUInteger)style
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
+ (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
float t = 0.0, b = 0.0, l = 0.0, r = 0.0;
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
}
|
||||
|
||||
+ (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
float t = 0.0, b = 0.0, l = 0.0, r = 0.0;
|
||||
|
||||
|
|
@ -131,7 +131,7 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
}
|
||||
|
||||
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
return 0.0;
|
||||
|
|
@ -183,7 +183,7 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
}
|
||||
|
||||
- (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
NSRect content = [object_getClass(self)
|
||||
contentRectForFrameRect: aRect
|
||||
|
|
@ -210,7 +210,7 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
}
|
||||
|
||||
- (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
NSToolbar *tb = [_window toolbar];
|
||||
|
||||
|
|
@ -571,13 +571,13 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
|
|||
@implementation GSBackendWindowDecorationView
|
||||
|
||||
+ (void) offsets: (float *)l : (float *)r : (float *)t : (float *)b
|
||||
forStyleMask: (unsigned int)style
|
||||
forStyleMask: (NSUInteger)style
|
||||
{
|
||||
[GSCurrentServer() styleoffsets: l : r : t : b : style];
|
||||
}
|
||||
|
||||
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
/* TODO: we could at least guess... */
|
||||
return 0.0;
|
||||
|
|
|
|||
|
|
@ -353,7 +353,7 @@ static Class controlClass;
|
|||
[super encodeWithCoder: aCoder];
|
||||
if ([aCoder allowsKeyedCoding])
|
||||
{
|
||||
[aCoder encodeInt: [self tag] forKey: @"NSTag"];
|
||||
[aCoder encodeInteger: [self tag] forKey: @"NSTag"];
|
||||
if ([self target] != nil)
|
||||
{
|
||||
[aCoder encodeObject: [self target] forKey: @"NSTarget"];
|
||||
|
|
@ -384,7 +384,7 @@ static Class controlClass;
|
|||
{
|
||||
if ([aDecoder containsValueForKey: @"NSTag"])
|
||||
{
|
||||
[self setTag: [aDecoder decodeIntForKey: @"NSTag"]];
|
||||
[self setTag: [aDecoder decodeIntegerForKey: @"NSTag"]];
|
||||
}
|
||||
if ([aDecoder containsValueForKey: @"NSTarget"])
|
||||
{
|
||||
|
|
|
|||
|
|
@ -199,12 +199,12 @@ static GSAlertPanel *criticalAlertPanel = nil;
|
|||
NSTextField *titleField;
|
||||
NSTextField *messageField;
|
||||
NSScrollView *scroll;
|
||||
int result;
|
||||
NSInteger result;
|
||||
BOOL isGreen; // we were unarchived and not resized.
|
||||
}
|
||||
|
||||
- (id) _initWithoutGModel;
|
||||
- (int) runModal;
|
||||
- (NSInteger) runModal;
|
||||
- (void) setTitleBar: (NSString*)titleBar
|
||||
icon: (NSImage*)icon
|
||||
title: (NSString*)title
|
||||
|
|
@ -219,7 +219,7 @@ static GSAlertPanel *criticalAlertPanel = nil;
|
|||
- (void) setButtons: (NSArray *)buttons;
|
||||
- (void) sizePanelToFit;
|
||||
- (void) buttonAction: (id)sender;
|
||||
- (int) result;
|
||||
- (NSInteger) result;
|
||||
- (BOOL) isActivePanel;
|
||||
@end
|
||||
|
||||
|
|
@ -311,9 +311,9 @@ makeScrollViewWithRect(NSRect rect)
|
|||
return scroll;
|
||||
}
|
||||
|
||||
- (NSButton*) _makeButtonWithRect: (NSRect)rect tag: (int)tag
|
||||
- (NSButton*) _makeButtonWithRect: (NSRect)rect tag: (NSInteger)tag
|
||||
{
|
||||
NSButton *button = [[NSButton alloc] initWithFrame: rect];
|
||||
NSButton *button = [[NSButton alloc] initWithFrame: rect];
|
||||
|
||||
[button setAutoresizingMask: NSViewMinXMargin | NSViewMaxYMargin];
|
||||
[button setButtonType: NSMomentaryPushInButton];
|
||||
|
|
@ -531,7 +531,7 @@ setKeyEquivalent(NSButton *button)
|
|||
int i;
|
||||
BOOL needsScroll;
|
||||
BOOL couldNeedScroll;
|
||||
unsigned int mask = [self styleMask];
|
||||
NSUInteger mask = [self styleMask];
|
||||
|
||||
/*
|
||||
* Set size to the size of a content rectangle of a panel
|
||||
|
|
@ -785,7 +785,7 @@ setKeyEquivalent(NSButton *button)
|
|||
[NSApp stopModalWithCode: result];
|
||||
}
|
||||
|
||||
- (int) result
|
||||
- (NSInteger) result
|
||||
{
|
||||
return result;
|
||||
}
|
||||
|
|
@ -795,7 +795,7 @@ setKeyEquivalent(NSButton *button)
|
|||
return [NSApp modalWindow] == self;
|
||||
}
|
||||
|
||||
- (int) runModal
|
||||
- (NSInteger) runModal
|
||||
{
|
||||
if (GSCurrentThread() != GSAppKitThread)
|
||||
{
|
||||
|
|
@ -1048,13 +1048,12 @@ setKeyEquivalent(NSButton *button)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
if(NSIsEmptyRect(contentRect))
|
||||
if (NSIsEmptyRect(contentRect))
|
||||
{
|
||||
contentRect = NSMakeRect(0,0,100,100);
|
||||
}
|
||||
|
|
@ -1063,10 +1062,9 @@ setKeyEquivalent(NSButton *button)
|
|||
styleMask: NSBorderlessWindowMask
|
||||
backing: bufferingType
|
||||
defer: flag];
|
||||
|
||||
if (self != nil)
|
||||
{
|
||||
//
|
||||
// FIXME
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
|
@ -1459,7 +1457,7 @@ NSGetAlertPanel(
|
|||
defaultButton, alternateButton, otherButton);
|
||||
}
|
||||
|
||||
int
|
||||
NSInteger
|
||||
NSRunAlertPanel(
|
||||
NSString *title,
|
||||
NSString *msg,
|
||||
|
|
@ -1470,7 +1468,7 @@ NSRunAlertPanel(
|
|||
va_list ap;
|
||||
NSString *message;
|
||||
GSAlertPanel *panel;
|
||||
int result;
|
||||
NSInteger result;
|
||||
|
||||
va_start(ap, otherButton);
|
||||
message = [NSString stringWithFormat: msg arguments: ap];
|
||||
|
|
@ -1494,7 +1492,7 @@ NSRunAlertPanel(
|
|||
return result;
|
||||
}
|
||||
|
||||
int
|
||||
NSInteger
|
||||
NSRunLocalizedAlertPanel(
|
||||
NSString *table,
|
||||
NSString *title,
|
||||
|
|
@ -1506,7 +1504,7 @@ NSRunLocalizedAlertPanel(
|
|||
va_list ap;
|
||||
NSString *message;
|
||||
GSAlertPanel *panel;
|
||||
int result;
|
||||
NSInteger result;
|
||||
NSBundle *bundle = [NSBundle mainBundle];
|
||||
|
||||
if (title == nil)
|
||||
|
|
@ -1562,8 +1560,7 @@ NSGetCriticalAlertPanel(
|
|||
defaultButton, alternateButton, otherButton);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
NSInteger
|
||||
NSRunCriticalAlertPanel(
|
||||
NSString *title,
|
||||
NSString *msg,
|
||||
|
|
@ -1574,7 +1571,7 @@ NSRunCriticalAlertPanel(
|
|||
va_list ap;
|
||||
NSString *message;
|
||||
GSAlertPanel *panel;
|
||||
int result;
|
||||
NSInteger result;
|
||||
|
||||
va_start(ap, otherButton);
|
||||
message = [NSString stringWithFormat: msg arguments: ap];
|
||||
|
|
@ -1608,7 +1605,7 @@ NSGetInformationalAlertPanel(
|
|||
}
|
||||
|
||||
|
||||
int
|
||||
NSInteger
|
||||
NSRunInformationalAlertPanel(
|
||||
NSString *title,
|
||||
NSString *msg,
|
||||
|
|
@ -1619,7 +1616,7 @@ NSRunInformationalAlertPanel(
|
|||
va_list ap;
|
||||
NSString *message;
|
||||
GSAlertPanel *panel;
|
||||
int result;
|
||||
NSInteger result;
|
||||
|
||||
va_start(ap, otherButton);
|
||||
message = [NSString stringWithFormat: msg arguments: ap];
|
||||
|
|
@ -1634,7 +1631,6 @@ NSRunInformationalAlertPanel(
|
|||
return result;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
NSReleaseAlertPanel(id panel)
|
||||
{
|
||||
|
|
@ -1686,8 +1682,8 @@ void NSBeginAlertSheet(NSString *title,
|
|||
[panel close];
|
||||
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
|
||||
{
|
||||
void (*didEnd)(id, SEL, id, int, void*);
|
||||
didEnd = (void (*)(id, SEL, id, int, void*))[modalDelegate
|
||||
void (*didEnd)(id, SEL, id, NSInteger, void*);
|
||||
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
|
||||
methodForSelector: didEndSelector];
|
||||
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
|
||||
}
|
||||
|
|
@ -1725,8 +1721,8 @@ void NSBeginCriticalAlertSheet(NSString *title,
|
|||
[panel close];
|
||||
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
|
||||
{
|
||||
void (*didEnd)(id, SEL, id, int, void*);
|
||||
didEnd = (void (*)(id, SEL, id, int, void*))[modalDelegate
|
||||
void (*didEnd)(id, SEL, id, NSInteger, void*);
|
||||
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
|
||||
methodForSelector: didEndSelector];
|
||||
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
|
||||
}
|
||||
|
|
@ -1766,8 +1762,8 @@ void NSBeginInformationalAlertSheet(NSString *title,
|
|||
[panel close];
|
||||
if (modalDelegate && [modalDelegate respondsToSelector: didEndSelector])
|
||||
{
|
||||
void (*didEnd)(id, SEL, id, int, void*);
|
||||
didEnd = (void (*)(id, SEL, id, int, void*))[modalDelegate
|
||||
void (*didEnd)(id, SEL, id, NSInteger, void*);
|
||||
didEnd = (void (*)(id, SEL, id, NSInteger, void*))[modalDelegate
|
||||
methodForSelector: didEndSelector];
|
||||
didEnd(modalDelegate, didEndSelector, panel, [panel result], contextInfo);
|
||||
}
|
||||
|
|
@ -1792,7 +1788,7 @@ void NSBeginInformationalAlertSheet(NSString *title,
|
|||
+ (NSAlert *) alertWithError: (NSError *)error
|
||||
{
|
||||
NSArray *options;
|
||||
unsigned int count;
|
||||
NSUInteger count;
|
||||
|
||||
options = [error localizedRecoveryOptions];
|
||||
count = [options count];
|
||||
|
|
@ -2007,7 +2003,7 @@ void NSBeginInformationalAlertSheet(NSString *title,
|
|||
}
|
||||
}
|
||||
|
||||
- (int) runModal
|
||||
- (NSInteger) runModal
|
||||
{
|
||||
if (GSCurrentThread() != GSAppKitThread)
|
||||
{
|
||||
|
|
@ -2044,13 +2040,13 @@ void NSBeginInformationalAlertSheet(NSString *title,
|
|||
}
|
||||
|
||||
- (void) _alertDidEnd: (NSWindow *)sheet
|
||||
returnCode: (int)returnCode
|
||||
returnCode: (NSInteger)returnCode
|
||||
contextInfo: (void *)contextInfo
|
||||
{
|
||||
if ([_modalDelegate respondsToSelector: _didEndSelector])
|
||||
{
|
||||
void (*didEnd)(id, SEL, id, int, void *);
|
||||
didEnd = (void (*)(id, SEL, id, int, void *))[_modalDelegate
|
||||
void (*didEnd)(id, SEL, id, NSInteger, void *);
|
||||
didEnd = (void (*)(id, SEL, id, NSInteger, void *))[_modalDelegate
|
||||
methodForSelector: _didEndSelector];
|
||||
didEnd(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
|
||||
}
|
||||
|
|
@ -2073,7 +2069,7 @@ void NSBeginInformationalAlertSheet(NSString *title,
|
|||
- (NSPanel *) userInfoPanel;
|
||||
@end
|
||||
|
||||
int GSRunExceptionPanel(
|
||||
NSInteger GSRunExceptionPanel(
|
||||
NSString *title,
|
||||
NSException *exception,
|
||||
NSString *defaultButton,
|
||||
|
|
@ -2082,7 +2078,7 @@ int GSRunExceptionPanel(
|
|||
{
|
||||
NSString *message;
|
||||
GSExceptionPanel *panel;
|
||||
int result;
|
||||
NSInteger result;
|
||||
|
||||
message = [NSString stringWithFormat: @"%@: %@",
|
||||
[exception name],
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static NSNotificationCenter *nc = nil;
|
|||
}
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
|
|
|
|||
|
|
@ -60,8 +60,9 @@
|
|||
backing: NSBackingStoreBuffered
|
||||
defer: NO];
|
||||
}
|
||||
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
|
|
@ -81,6 +82,7 @@
|
|||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) _initDefaults
|
||||
{
|
||||
[super _initDefaults];
|
||||
|
|
|
|||
|
|
@ -527,7 +527,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
|
|||
{
|
||||
NSPoint lastLocation;
|
||||
NSPoint location;
|
||||
unsigned eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
|
||||
NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
|
||||
| NSPeriodicMask | NSOtherMouseUpMask | NSRightMouseUpMask;
|
||||
NSDate *theDistantFuture = [NSDate distantFuture];
|
||||
BOOL done = NO;
|
||||
|
|
@ -710,7 +710,7 @@ static NSNotificationCenter *nc = nil;
|
|||
}
|
||||
|
||||
+ (NSRect) contentRectForFrameRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
if (!windowDecorator)
|
||||
windowDecorator = [GSWindowDecorationView windowDecorator];
|
||||
|
|
@ -720,7 +720,7 @@ static NSNotificationCenter *nc = nil;
|
|||
}
|
||||
|
||||
+ (NSRect) frameRectForContentRect: (NSRect)aRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
if (!windowDecorator)
|
||||
windowDecorator = [GSWindowDecorationView windowDecorator];
|
||||
|
|
@ -730,7 +730,7 @@ static NSNotificationCenter *nc = nil;
|
|||
}
|
||||
|
||||
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
{
|
||||
if (!windowDecorator)
|
||||
windowDecorator = [GSWindowDecorationView windowDecorator];
|
||||
|
|
@ -756,7 +756,7 @@ static NSNotificationCenter *nc = nil;
|
|||
*/
|
||||
- (id) init
|
||||
{
|
||||
int style;
|
||||
NSUInteger style;
|
||||
|
||||
style = NSTitledWindowMask | NSClosableWindowMask
|
||||
| NSMiniaturizableWindowMask | NSResizableWindowMask;
|
||||
|
|
@ -973,7 +973,7 @@ many times.
|
|||
*/
|
||||
while ((type = [enumerator nextObject]) != nil)
|
||||
{
|
||||
int i, count = [dragTypes countForObject: type];
|
||||
NSUInteger i, count = [dragTypes countForObject: type];
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
|
|
@ -1023,7 +1023,7 @@ many times.
|
|||
</p>
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
{
|
||||
|
|
@ -1136,7 +1136,7 @@ many times.
|
|||
</p>
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
styleMask: (NSUInteger)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
defer: (BOOL)flag
|
||||
screen: (NSScreen*)aScreen
|
||||
|
|
@ -1156,7 +1156,7 @@ many times.
|
|||
- (id) initWithWindowRef: (void *)windowRef
|
||||
{
|
||||
NSRect contentRect;
|
||||
unsigned int aStyle;
|
||||
unsigned aStyle;
|
||||
NSBackingStoreType bufferingType;
|
||||
NSScreen* aScreen;
|
||||
int screen;
|
||||
|
|
@ -1307,7 +1307,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
}
|
||||
}
|
||||
|
||||
- (unsigned int) styleMask
|
||||
- (NSUInteger) styleMask
|
||||
{
|
||||
return _styleMask;
|
||||
}
|
||||
|
|
@ -1392,7 +1392,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
}
|
||||
}
|
||||
|
||||
- (int) gState
|
||||
- (NSInteger) gState
|
||||
{
|
||||
if (_gstate <= 0)
|
||||
NSDebugLLog(@"NSWindow", @"gState called on deferred window");
|
||||
|
|
@ -1414,7 +1414,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
_f.is_one_shot = flag;
|
||||
}
|
||||
|
||||
- (int) windowNumber
|
||||
- (NSInteger) windowNumber
|
||||
{
|
||||
if (_windowNum <= 0)
|
||||
NSDebugLLog(@"NSWindow", @"windowNumber called on deferred window");
|
||||
|
|
@ -1653,7 +1653,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
return _f.visible;
|
||||
}
|
||||
|
||||
- (int) level
|
||||
- (NSInteger) level
|
||||
{
|
||||
return _windowLevel;
|
||||
}
|
||||
|
|
@ -1765,7 +1765,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
is minus one, then the backend should not try to keep the window below the
|
||||
current key/main window
|
||||
*/
|
||||
- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin
|
||||
- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (NSInteger)otherWin
|
||||
{
|
||||
GSDisplayServer *srv = GSServerForWindow(self);
|
||||
BOOL display = NO;
|
||||
|
|
@ -1943,7 +1943,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
}
|
||||
}
|
||||
|
||||
- (void) setLevel: (int)newLevel
|
||||
- (void) setLevel: (NSInteger)newLevel
|
||||
{
|
||||
if (_windowLevel != newLevel)
|
||||
{
|
||||
|
|
@ -2424,7 +2424,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
|
|||
*/
|
||||
- (void) flushWindow
|
||||
{
|
||||
int i;
|
||||
NSUInteger i;
|
||||
|
||||
/*
|
||||
* If flushWindow is called while flush is disabled
|
||||
|
|
@ -2654,12 +2654,12 @@ discardCursorRectsForView(NSView *theView)
|
|||
if (theView->_rFlags.has_subviews)
|
||||
{
|
||||
NSArray *s = theView->_sub_views;
|
||||
unsigned count = [s count];
|
||||
NSUInteger count = [s count];
|
||||
|
||||
if (count)
|
||||
{
|
||||
NSView *subs[count];
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
[s getObjects: subs];
|
||||
for (i = 0; i < count; i++)
|
||||
|
|
@ -2717,12 +2717,12 @@ resetCursorRectsForView(NSView *theView)
|
|||
if (theView->_rFlags.has_subviews)
|
||||
{
|
||||
NSArray *s = theView->_sub_views;
|
||||
unsigned count = [s count];
|
||||
NSUInteger count = [s count];
|
||||
|
||||
if (count)
|
||||
{
|
||||
NSView *subs[count];
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
[s getObjects: subs];
|
||||
for (i = 0; i < count; i++)
|
||||
|
|
@ -3045,7 +3045,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
}
|
||||
|
||||
+ (NSButton *) standardWindowButton: (NSWindowButton)button
|
||||
forStyleMask: (unsigned int) mask
|
||||
forStyleMask: (NSUInteger) mask
|
||||
{
|
||||
NSButton *newButton;
|
||||
|
||||
|
|
@ -3106,7 +3106,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
_f.shows_toolbar_button = flag;
|
||||
}
|
||||
|
||||
- (int) resizeFlags
|
||||
- (NSInteger) resizeFlags
|
||||
{
|
||||
// FIXME: The implementation is missing
|
||||
return 0;
|
||||
|
|
@ -3214,7 +3214,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
return [NSApp currentEvent];
|
||||
}
|
||||
|
||||
- (void) discardEventsMatchingMask: (unsigned int)mask
|
||||
- (void) discardEventsMatchingMask: (NSUInteger)mask
|
||||
beforeEvent: (NSEvent*)lastEvent
|
||||
{
|
||||
[NSApp discardEventsMatchingMask: mask beforeEvent: lastEvent];
|
||||
|
|
@ -3422,7 +3422,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
return p;
|
||||
}
|
||||
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
|
||||
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask
|
||||
{
|
||||
return [NSApp nextEventMatchingMask: mask
|
||||
untilDate: [NSDate distantFuture]
|
||||
|
|
@ -3430,7 +3430,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
dequeue: YES];
|
||||
}
|
||||
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
|
||||
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask
|
||||
untilDate: (NSDate*)expiration
|
||||
inMode: (NSString*)mode
|
||||
dequeue: (BOOL)deqFlag
|
||||
|
|
@ -3455,7 +3455,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
{
|
||||
BOOL isFlipped = [theView isFlipped];
|
||||
NSArray *tr = theView->_tracking_rects;
|
||||
unsigned count = [tr count];
|
||||
NSUInteger count = [tr count];
|
||||
|
||||
/*
|
||||
* Loop through the tracking rectangles
|
||||
|
|
@ -3465,7 +3465,7 @@ resetCursorRectsForView(NSView *theView)
|
|||
GSTrackingRect *rects[count];
|
||||
NSPoint loc = [theEvent locationInWindow];
|
||||
NSPoint lastPoint = _lastPoint;
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
lastPoint = [theView convertPoint: lastPoint fromView: nil];
|
||||
loc = [theView convertPoint: loc fromView: nil];
|
||||
|
|
@ -3551,12 +3551,12 @@ resetCursorRectsForView(NSView *theView)
|
|||
if (theView->_rFlags.has_subviews)
|
||||
{
|
||||
NSArray *sb = theView->_sub_views;
|
||||
unsigned count = [sb count];
|
||||
NSUInteger count = [sb count];
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
NSView *subs[count];
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
[sb getObjects: subs];
|
||||
for (i = 0; i < count; ++i)
|
||||
|
|
@ -3573,14 +3573,14 @@ resetCursorRectsForView(NSView *theView)
|
|||
if (theView->_rFlags.valid_rects)
|
||||
{
|
||||
NSArray *tr = theView->_cursor_rects;
|
||||
unsigned count = [tr count];
|
||||
NSUInteger count = [tr count];
|
||||
|
||||
// Loop through cursor rectangles
|
||||
if (count > 0)
|
||||
{
|
||||
GSTrackingRect *rects[count];
|
||||
NSPoint loc = [theEvent locationInWindow];
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
[tr getObjects: rects];
|
||||
|
||||
|
|
@ -3641,12 +3641,12 @@ resetCursorRectsForView(NSView *theView)
|
|||
if (theView->_rFlags.has_subviews)
|
||||
{
|
||||
NSArray *sb = theView->_sub_views;
|
||||
unsigned count = [sb count];
|
||||
NSUInteger count = [sb count];
|
||||
|
||||
if (count > 0)
|
||||
{
|
||||
NSView *subs[count];
|
||||
unsigned i;
|
||||
NSUInteger i;
|
||||
|
||||
[sb getObjects: subs];
|
||||
for (i = 0; i < count; ++i)
|
||||
|
|
@ -5343,7 +5343,7 @@ current key view.<br />
|
|||
NSSize aSize;
|
||||
NSRect aRect;
|
||||
NSPoint p;
|
||||
unsigned aStyle;
|
||||
NSUInteger aStyle;
|
||||
NSBackingStoreType aBacking;
|
||||
int anInt;
|
||||
id obj;
|
||||
|
|
@ -5673,19 +5673,19 @@ BOOL GSViewAcceptsDrag(NSView *v, id<NSDraggingInfo> dragInfo)
|
|||
return NO;
|
||||
}
|
||||
|
||||
void NSCountWindows(int *count)
|
||||
void NSCountWindows(NSInteger *count)
|
||||
{
|
||||
*count = (int)[[GSCurrentServer() windowlist] count];
|
||||
*count = [[GSCurrentServer() windowlist] count];
|
||||
}
|
||||
|
||||
void NSWindowList(int size, int list[])
|
||||
void NSWindowList(NSInteger size, NSInteger list[])
|
||||
{
|
||||
NSArray *windowList = [GSCurrentServer() windowlist];
|
||||
unsigned i, c;
|
||||
NSUInteger i, c;
|
||||
|
||||
for (i = 0, c = [windowList count]; i < size && i < c; i++)
|
||||
{
|
||||
list[i] = [[windowList objectAtIndex:i] intValue];
|
||||
list[i] = [[windowList objectAtIndex: i] integerValue];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -5693,14 +5693,14 @@ NSArray *GSOrderedWindows(void)
|
|||
{
|
||||
NSArray *window_list = [GSCurrentServer() windowlist];
|
||||
NSMutableArray *ret = [NSMutableArray array];
|
||||
int i, c;
|
||||
NSUInteger i, c;
|
||||
|
||||
for (i = 0, c = [window_list count]; i < c; i++)
|
||||
{
|
||||
int windowNumber = [[window_list objectAtIndex:i] intValue];
|
||||
NSInteger windowNumber = [[window_list objectAtIndex: i] integerValue];
|
||||
NSWindow *win = GSWindowWithNumber(windowNumber);
|
||||
|
||||
[ret addObject:win];
|
||||
[ret addObject: win];
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
@ -5714,7 +5714,7 @@ NSArray* GSAllWindows(void)
|
|||
return nil;
|
||||
}
|
||||
|
||||
NSWindow* GSWindowWithNumber(int num)
|
||||
NSWindow* GSWindowWithNumber(NSInteger num)
|
||||
{
|
||||
if (windowmaps)
|
||||
return (NSWindow*)NSMapGet(windowmaps, (void*)(intptr_t)num);
|
||||
|
|
|
|||
Loading…
Reference in a new issue