Various header updates for MacOS-X compat

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4194 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 1999-05-04 13:17:26 +00:00
parent 9f478f8a62
commit 76eb0414e1
5 changed files with 628 additions and 516 deletions

View file

@ -3,7 +3,7 @@
Abstract class which is basis of command and event processing
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996,1999 Free Software Foundation, Inc.
Author: Scott Christley <scottc@net-community.com>
Date: 1996
@ -34,210 +34,209 @@
@implementation NSResponder
//
// Class methods
//
+ (void)initialize
/*
* Class methods
*/
+ (void) initialize
{
if (self == [NSResponder class])
{
NSDebugLog(@"Initialize NSResponder class\n");
// Initial version
[self setVersion:1];
[self setVersion: 1];
}
}
//
// Instance methods
//
//
// Managing the next responder
//
- nextResponder
/*
* Instance methods
*/
/*
* Managing the next responder
*/
- (id) nextResponder
{
return next_responder;
}
- (void)setNextResponder:aResponder
- (void) setNextResponder: (NSResponder*)aResponder
{
next_responder = aResponder;
}
//
// Determining the first responder
//
- (BOOL)acceptsFirstResponder
/*
* Determining the first responder
*/
- (BOOL) acceptsFirstResponder
{
return NO;
}
- (BOOL)becomeFirstResponder
- (BOOL) becomeFirstResponder
{
return YES;
}
- (BOOL)resignFirstResponder
- (BOOL) resignFirstResponder
{
return YES;
}
//
// Aid event processing
//
- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
/*
* Aid event processing
*/
- (BOOL) performKeyEquivalent: (NSEvent *)theEvent
{
return NO;
}
- (BOOL)tryToPerform:(SEL)anAction with:anObject
- (BOOL) tryToPerform: (SEL)anAction with: (id)anObject
{
// Can we perform the action -then do it
if ([self respondsToSelector:anAction])
/* Can we perform the action -then do it */
if ([self respondsToSelector: anAction])
{
[self performSelector:anAction withObject:anObject];
[self performSelector: anAction withObject: anObject];
return YES;
}
else
{
// If we cannot perform then try the next responder
/* If we cannot perform then try the next responder */
if (!next_responder)
return NO;
else
return [next_responder tryToPerform:anAction with:anObject];
return [next_responder tryToPerform: anAction with: anObject];
}
}
//
// Forwarding event messages
//
- (void)flagsChanged:(NSEvent *)theEvent
/*
* Forwarding event messages
*/
- (void) flagsChanged: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder flagsChanged:theEvent];
return [next_responder flagsChanged: theEvent];
else
return [self noResponderFor:@selector(flagsChanged:)];
return [self noResponderFor: @selector(flagsChanged: )];
}
- (void)helpRequested:(NSEvent *)theEvent
- (void) helpRequested: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder helpRequested:theEvent];
return [next_responder helpRequested: theEvent];
else
return [self noResponderFor:@selector(helpRequested:)];
return [self noResponderFor: @selector(helpRequested: )];
}
- (void)keyDown:(NSEvent *)theEvent
- (void) keyDown: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder keyDown:theEvent];
return [next_responder keyDown: theEvent];
else
return [self noResponderFor:@selector(keyDown:)];
return [self noResponderFor: @selector(keyDown: )];
}
- (void)keyUp:(NSEvent *)theEvent
- (void) keyUp: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder keyUp:theEvent];
return [next_responder keyUp: theEvent];
else
return [self noResponderFor:@selector(keyUp:)];
return [self noResponderFor: @selector(keyUp: )];
}
- (void)mouseDown:(NSEvent *)theEvent
- (void) mouseDown: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseDown:theEvent];
return [next_responder mouseDown: theEvent];
else
return [self noResponderFor:@selector(mouseDown:)];
return [self noResponderFor: @selector(mouseDown: )];
}
- (void)mouseDragged:(NSEvent *)theEvent
- (void) mouseDragged: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseDragged:theEvent];
return [next_responder mouseDragged: theEvent];
else
return [self noResponderFor:@selector(mouseDragged:)];
return [self noResponderFor: @selector(mouseDragged: )];
}
- (void)mouseEntered:(NSEvent *)theEvent
- (void) mouseEntered: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseEntered:theEvent];
return [next_responder mouseEntered: theEvent];
else
return [self noResponderFor:@selector(mouseEntered:)];
return [self noResponderFor: @selector(mouseEntered: )];
}
- (void)mouseExited:(NSEvent *)theEvent
- (void) mouseExited: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseExited:theEvent];
return [next_responder mouseExited: theEvent];
else
return [self noResponderFor:@selector(mouseExited:)];
return [self noResponderFor: @selector(mouseExited: )];
}
- (void)mouseMoved:(NSEvent *)theEvent
- (void) mouseMoved: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseMoved:theEvent];
return [next_responder mouseMoved: theEvent];
else
return [self noResponderFor:@selector(mouseMoved:)];
return [self noResponderFor: @selector(mouseMoved: )];
}
- (void)mouseUp:(NSEvent *)theEvent
- (void) mouseUp: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder mouseUp:theEvent];
return [next_responder mouseUp: theEvent];
else
return [self noResponderFor:@selector(mouseUp:)];
return [self noResponderFor: @selector(mouseUp: )];
}
- (void)noResponderFor:(SEL)eventSelector
- (void) noResponderFor: (SEL)eventSelector
{
// Only beep for key down events
if (sel_eq(eventSelector, @selector(keyDown:)))
/* Only beep for key down events */
if (sel_eq(eventSelector, @selector(keyDown: )))
NSBeep();
}
- (void)rightMouseDown:(NSEvent *)theEvent
- (void) rightMouseDown: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder rightMouseDown:theEvent];
return [next_responder rightMouseDown: theEvent];
else
return [self noResponderFor:@selector(rightMouseDown:)];
return [self noResponderFor: @selector(rightMouseDown: )];
}
- (void)rightMouseDragged:(NSEvent *)theEvent
- (void) rightMouseDragged: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder rightMouseDragged:theEvent];
return [next_responder rightMouseDragged: theEvent];
else
return [self noResponderFor:@selector(rightMouseDragged:)];
return [self noResponderFor: @selector(rightMouseDragged: )];
}
- (void)rightMouseUp:(NSEvent *)theEvent
- (void) rightMouseUp: (NSEvent *)theEvent
{
if (next_responder)
return [next_responder rightMouseUp:theEvent];
return [next_responder rightMouseUp: theEvent];
else
return [self noResponderFor:@selector(rightMouseUp:)];
return [self noResponderFor: @selector(rightMouseUp: )];
}
//
// Services menu support
//
- validRequestorForSendType:(NSString *)typeSent
returnType:(NSString *)typeReturned
/*
* Services menu support
*/
- (id) validRequestorForSendType: (NSString *)typeSent
returnType: (NSString *)typeReturned
{
if (next_responder)
return [next_responder validRequestorForSendType:typeSent
returnType:typeReturned];
return [next_responder validRequestorForSendType: typeSent
returnType: typeReturned];
else
return nil;
}
//
// NSCoding protocol
//
/*
* NSCoding protocol
*/
- (void) encodeWithCoder: (NSCoder*)aCoder
{
[aCoder encodeConditionalObject: next_responder];
@ -246,8 +245,17 @@
- (id) initWithCoder: (NSCoder*)aDecoder
{
next_responder = [aDecoder decodeObject];
return self;
}
- (NSInterfaceStyle) interfaceStyle
{
return interface_style;
}
- (void) setInterfaceStyle: (NSInterfaceStyle)aStyle
{
interface_style = aStyle;
}
@end

View file

@ -110,13 +110,13 @@
}
+ (NSRect) frameRectForContentRect: (NSRect)aRect
styleMask: (unsigned int)aStyle
styleMask: (unsigned int)aStyle
{
return aRect;
}
+ (NSRect) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (unsigned int)aStyle
styleMask: (unsigned int)aStyle
{
return NSZeroRect;
}
@ -226,7 +226,10 @@
//
// Accessing the content view
//
- contentView { return content_view; }
- (id) contentView
{
return content_view;
}
- (void) setContentView: (NSView *)aView
{
@ -328,7 +331,7 @@
- (int) gState
{
return 0;
return gstate;
}
- (BOOL) isOneShot
@ -351,11 +354,6 @@
return window_num;
}
- (void) setWindowNumber: (int)windowNum
{
window_num = windowNum;
}
//
// The miniwindow
//
@ -618,6 +616,11 @@
maximum_size = aSize;
}
- (NSSize) resizeIncrements
{
return increments;
}
- (void) setResizeIncrements: (NSSize)aSize
{
increments = aSize;
@ -879,8 +882,15 @@
[nc postNotificationName: NSWindowDidDeminiaturizeNotification object: self];
}
- (BOOL) isDocumentEdited { return is_edited; }
- (BOOL) isReleasedWhenClosed { return is_released_when_closed; }
- (BOOL) isDocumentEdited
{
return is_edited;
}
- (BOOL) isReleasedWhenClosed
{
return is_released_when_closed;
}
- (void) miniaturize: sender
{
@ -894,33 +904,42 @@
- (void) performClose: sender
{
/* self must have a close button in order to be closed */
if (!([self styleMask] & NSClosableWindowMask))
{ // self must have a close
NSBeep(); // button in order to be
return; // closed
{
NSBeep();
return;
}
if ([delegate respondsToSelector: @selector(windowShouldClose:)])
{ // if delegate responds to
if (![delegate windowShouldClose: self]) // windowShouldClose query
{ // it to see if it's ok to
NSBeep(); // close the window
{
/*
* if delegate responds to windowShouldClose query it to see if
* it's ok to close the window
*/
if (![delegate windowShouldClose: self])
{
NSBeep();
return;
}
}
else
{
/*
* else if self responds to windowShouldClose query
* self to see if it's ok to close self
*/
if ([self respondsToSelector: @selector(windowShouldClose:)])
{ // else if self responds to
if (![self windowShouldClose: self]) // windowShouldClose query
{ // self to see if it's ok
NSBeep(); // to close self
{
if (![self windowShouldClose: self])
{
NSBeep();
return;
}
}
}
[self close]; // it's ok to close self
[self close];
}
- (void) performMiniaturize: (id)sender
@ -1635,6 +1654,16 @@
return self;
}
- (NSInterfaceStyle) interfaceStyle
{
return interface_style;
}
- (void) setInterfaceStyle: (NSInterfaceStyle)aStyle
{
interface_style = aStyle;
}
@end
//
@ -1647,6 +1676,11 @@
return nil;
}
- (void) setWindowNumber: (int)windowNum
{
window_num = windowNum;
}
//
// Mouse capture/release
//
@ -1657,38 +1691,42 @@
- (void) performHide: sender {}
- (void) performUnhide: sender {}
- (void) initDefaults // Allow subclasses to init
{ // without the backend
first_responder = nil; // class attempting to
original_responder = nil; // create an actual window
delegate = nil;
window_num = 0;
background_color = [[NSColor lightGrayColor] retain];
represented_filename = @"Window";
miniaturized_title = @"Window";
miniaturized_image = nil;
window_title = @"Window";
last_point = NSZeroPoint;
window_level = NSNormalWindowLevel;
/*
* Allow subclasses to init without the backend
* class attempting to create an actual window
*/
- (void) initDefaults
{
first_responder = nil;
original_responder = nil;
delegate = nil;
window_num = 0;
background_color = [[NSColor controlColor] retain];
represented_filename = @"Window";
miniaturized_title = @"Window";
miniaturized_image = nil;
window_title = @"Window";
last_point = NSZeroPoint;
window_level = NSNormalWindowLevel;
is_one_shot = NO;
needs_display = NO;
is_autodisplay = YES;
optimize_drawing = YES;
views_need_display = NO;
depth_limit = 8;
dynamic_depth_limit = YES;
cursor_rects_enabled = NO;
visible = NO;
is_key = NO;
is_main = NO;
is_edited = NO;
is_released_when_closed = YES;
is_miniaturized = NO;
disable_flush_window = NO;
menu_exclude = NO;
hides_on_deactivate = NO;
accepts_mouse_moved = NO;
is_one_shot = NO;
needs_display = NO;
is_autodisplay = YES;
optimize_drawing = YES;
views_need_display = NO;
depth_limit = 8;
dynamic_depth_limit = YES;
cursor_rects_enabled = NO;
visible = NO;
is_key = NO;
is_main = NO;
is_edited = NO;
is_released_when_closed = YES;
is_miniaturized = NO;
disable_flush_window = NO;
menu_exclude = NO;
hides_on_deactivate = NO;
accepts_mouse_moved = NO;
}
- (id) cleanInit