Updated for change in NSWindow's ivars

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7396 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2000-09-05 17:24:15 +00:00
parent 4a96f79258
commit 858981c0df
3 changed files with 8 additions and 8 deletions

View file

@ -128,7 +128,7 @@ NSApplication *NSApp = nil;
[super _initDefaults]; [super _initDefaults];
[self setExcludedFromWindowsMenu: YES]; [self setExcludedFromWindowsMenu: YES];
[self setReleasedWhenClosed: NO]; [self setReleasedWhenClosed: NO];
window_level = NSDockWindowLevel; _windowLevel = NSDockWindowLevel;
} }
@end @end

View file

@ -1279,7 +1279,7 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
- (void) _initDefaults - (void) _initDefaults
{ {
[super _initDefaults]; [super _initDefaults];
window_level = NSSubmenuWindowLevel; _windowLevel = NSSubmenuWindowLevel;
} }
- (id) init - (id) init
@ -1309,7 +1309,7 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations";
// This method is a hack to speed-up menu dragging. // This method is a hack to speed-up menu dragging.
- (void) moveToPoint: (NSPoint)aPoint - (void) moveToPoint: (NSPoint)aPoint
{ {
NSRect frameRect = frame; NSRect frameRect = _frame;
frameRect.origin = aPoint; frameRect.origin = aPoint;
DPSplacewindow(GSCurrentContext(), frameRect.origin.x, frameRect.origin.y, DPSplacewindow(GSCurrentContext(), frameRect.origin.x, frameRect.origin.y,

View file

@ -1267,7 +1267,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
NSDebugLLog(@"NSView", @"Displaying rect \n\t%@\n\t window %p", NSDebugLLog(@"NSView", @"Displaying rect \n\t%@\n\t window %p",
NSStringFromRect(wrect), _window); NSStringFromRect(wrect), _window);
window_t = (struct NSWindow_struct *)_window; window_t = (struct NSWindow_struct *)_window;
[window_t->rectsBeingDrawn addObject: [NSValue valueWithRect: wrect]]; [window_t->_rectsBeingDrawn addObject: [NSValue valueWithRect: wrect]];
DPSgsave(ctxt); DPSgsave(ctxt);
if (_gstate) if (_gstate)
@ -1342,12 +1342,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
window_t = (struct NSWindow_struct *)_window; window_t = (struct NSWindow_struct *)_window;
if (flush) if (flush)
{ {
rect = [[window_t->rectsBeingDrawn lastObject] rectValue]; rect = [[window_t->_rectsBeingDrawn lastObject] rectValue];
window_t->rectNeedingFlush = window_t->_rectNeedingFlush =
NSUnionRect(window_t->rectNeedingFlush, rect); NSUnionRect(window_t->_rectNeedingFlush, rect);
window_t->_f.needs_flush = YES; window_t->_f.needs_flush = YES;
} }
[window_t->rectsBeingDrawn removeLastObject]; [window_t->_rectsBeingDrawn removeLastObject];
[ctxt unlockFocusView: self needsFlush: YES ]; [ctxt unlockFocusView: self needsFlush: YES ];
} }