diff --git a/ChangeLog b/ChangeLog index 7f9edb968..34a7339e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 03 05:36:00 2000 Richard Frith-Macdonald + + * Source/NSMenu.m:([NSMenuWindowTitleView -drawRect:]) fixed to draw + contents in bounds rather than given rect. + Fri Mar 3 02:25:24 2000 Nicola Pero * Source/NSWindow.m ([-performZoom:]), ([-zoom:]): Added methods diff --git a/Headers/gnustep/gui/NSWindow.h b/Headers/gnustep/gui/NSWindow.h index 5d2a047b9..5ce754f16 100644 --- a/Headers/gnustep/gui/NSWindow.h +++ b/Headers/gnustep/gui/NSWindow.h @@ -500,7 +500,6 @@ extern NSSize NSTokenSize; - (void) performDeminiaturize: sender; - (void) performHide: sender; - (void) performUnhide: sender; -- (void) setContentViewSize: (NSSize)aSize; - (void) _setVisible: (BOOL)flag; @end diff --git a/Source/NSMenu.m b/Source/NSMenu.m index 6d79307c6..5bb475ffb 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -1327,17 +1327,16 @@ static NSString *NSMenuLocationsKey = @"NSMenuLocations"; - (void) drawRect: (NSRect)rect { NSGraphicsContext *ctxt = GSCurrentContext(); - NSRect workRect = rect; - + NSRect workRect = [self bounds]; // Draw the dark gray upper left lines. DPSgsave(ctxt); - DPSsetlinewidth(ctxt, 1); - DPSsetgray(ctxt, 0.333); - DPSmoveto(ctxt, workRect.origin.x, workRect.origin.y); - DPSrlineto(ctxt, 0, workRect.size.height); - DPSrlineto(ctxt, workRect.size.width, 0); - DPSstroke(ctxt); + DPSsetlinewidth(ctxt, 1); + DPSsetgray(ctxt, 0.333); + DPSmoveto(ctxt, workRect.origin.x, workRect.origin.y); + DPSrlineto(ctxt, 0, workRect.size.height); + DPSrlineto(ctxt, workRect.size.width, 0); + DPSstroke(ctxt); DPSgrestore(ctxt); // Draw the title box's button.