git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@9049 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2001-02-08 00:00:32 +00:00
parent 98ff76a0ca
commit c76f978552

View file

@ -1489,8 +1489,13 @@ static NSMapTable* windowmaps = NULL;
_rFlags.needs_display = NO; _rFlags.needs_display = NO;
// FIXME: Is the first responder processing needed here? // FIXME: Is the first responder processing needed here?
if ((!_firstResponder) || (_firstResponder == self)) if ((!_firstResponder) || (_firstResponder == self))
if (_initialFirstResponder) {
[self makeFirstResponder: _initialFirstResponder]; if (_initialFirstResponder)
{
[self makeFirstResponder: _initialFirstResponder];
}
}
/* /*
* inform first responder of it's status so it can set the focus to itself * inform first responder of it's status so it can set the focus to itself
*/ */
@ -1668,12 +1673,16 @@ static NSMapTable* windowmaps = NULL;
- (BOOL) canStoreColor - (BOOL) canStoreColor
{ {
if (_depthLimit > 1) if (_depthLimit > 1)
return YES; {
return YES;
}
else else
return NO; {
return NO;
}
} }
- (NSScreen*) deepestScreen - (NSScreen *) deepestScreen
{ {
// FIXME: We must check the screens the window is on // FIXME: We must check the screens the window is on
return [NSScreen deepestScreen]; return [NSScreen deepestScreen];
@ -1689,7 +1698,7 @@ static NSMapTable* windowmaps = NULL;
return _f.dynamic_depth_limit; return _f.dynamic_depth_limit;
} }
- (NSScreen*) screen - (NSScreen *) screen
{ {
// FIXME: Works only if there is only one screen // FIXME: Works only if there is only one screen
return [NSScreen mainScreen]; return [NSScreen mainScreen];
@ -1698,7 +1707,9 @@ static NSMapTable* windowmaps = NULL;
- (void) setDepthLimit: (NSWindowDepth)limit - (void) setDepthLimit: (NSWindowDepth)limit
{ {
if (limit == 0) if (limit == 0)
limit = [[self class] defaultDepthLimit]; {
limit = [isa defaultDepthLimit];
}
_depthLimit = limit; _depthLimit = limit;
} }
@ -3142,7 +3153,7 @@ resetCursorRectsForView(NSView *theView)
return YES; return YES;
} }
- (NSString*) stringWithSavedFrame - (NSString *) stringWithSavedFrame
{ {
NSRect fRect; NSRect fRect;
NSRect sRect; NSRect sRect;
@ -3166,7 +3177,7 @@ resetCursorRectsForView(NSView *theView)
/* /*
* Printing and postscript * Printing and postscript
*/ */
- (NSData*) dataWithEPSInsideRect: (NSRect)rect - (NSData *) dataWithEPSInsideRect: (NSRect)rect
{ {
return [_contentView dataWithEPSInsideRect: return [_contentView dataWithEPSInsideRect:
[_contentView convertRect: rect fromView: nil]]; [_contentView convertRect: rect fromView: nil]];
@ -3208,12 +3219,12 @@ resetCursorRectsForView(NSView *theView)
* Default botton * Default botton
*/ */
- (NSButtonCell*) defaultButtonCell - (NSButtonCell *) defaultButtonCell
{ {
return _defaultButtonCell; return _defaultButtonCell;
} }
- (void) setDefaultButtonCell: (NSButtonCell*)aButtonCell - (void) setDefaultButtonCell: (NSButtonCell *)aButtonCell
{ {
ASSIGN(_defaultButtonCell, aButtonCell); ASSIGN(_defaultButtonCell, aButtonCell);
_f.default_button_cell_key_disabled = NO; _f.default_button_cell_key_disabled = NO;
@ -3414,10 +3425,10 @@ resetCursorRectsForView(NSView *theView)
[super setInterfaceStyle: aStyle]; [super setInterfaceStyle: aStyle];
} }
- (void*) windowHandle - (void *) windowHandle
{ {
// FIXME: Should only be defined on MS Windows // FIXME: Should only be defined on MS Windows
return (void*) 0; return (void *) 0;
} }
@end @end