Remove previous change

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4385 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 1999-06-10 03:05:11 +00:00
parent e3c716678d
commit df72c2d544
4 changed files with 1 additions and 24 deletions

View file

@ -9,14 +9,6 @@ Wed Jun 9 8:35:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Source/NSApplication.m: Fix retain/release problems introduced by * Source/NSApplication.m: Fix retain/release problems introduced by
event system changes. event system changes.
1999-06-08 Adam Fedor <fedor@gnu.org>
* Headers/gnustep/gui/NSGraphicsContext.h (-convertBaseToScreen:):
New method. (-convertScreenToBase): Likewise.
* Source/NSGraphicsContext.m: Default implementation.
* Source/NSWindow.m (-convertBaseToScreen:): Use them.
(-convertScreenToBase): Likewise.
Sun Jun 6 20:40:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk> Sun Jun 6 20:40:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* Headers/AppKit/NSEvent.h: Added new event types and masks and tidied. * Headers/AppKit/NSEvent.h: Added new event types and masks and tidied.

View file

@ -129,10 +129,6 @@ NSGraphicsContext *GSCurrentContext();
- (void) lockFocusView: (NSView*)aView inRect: (NSRect)rect; - (void) lockFocusView: (NSView*)aView inRect: (NSRect)rect;
- (void) unlockFocusView: (NSView*)aView needsFlush: (BOOL)flush; - (void) unlockFocusView: (NSView*)aView needsFlush: (BOOL)flush;
/* Convert to/from base coordinates of root window */
- (NSPoint) convertBaseToScreen: (NSPoint)point;
- (NSPoint) convertScreenToBase: (NSPoint)point;
@end @end
#endif #endif

View file

@ -263,16 +263,6 @@ struct NSWindow_struct
[focus_stack removeLastObject]; [focus_stack removeLastObject];
} }
- (NSPoint) convertBaseToScreen: (NSPoint)point
{
return point;
}
- (NSPoint) convertScreenToBase: (NSPoint)point
{
return point;
}
@end @end
@implementation NSGraphicsContext (Private) @implementation NSGraphicsContext (Private)

View file

@ -658,14 +658,13 @@ static Class responderClass;
screenPoint.x = frame.origin.x + basePoint.x; screenPoint.x = frame.origin.x + basePoint.x;
screenPoint.y = frame.origin.y + basePoint.y; screenPoint.y = frame.origin.y + basePoint.y;
return [GSCurrentContext() convertBaseToScreen: screenPoint]; return screenPoint;
} }
- (NSPoint) convertScreenToBase: (NSPoint)screenPoint - (NSPoint) convertScreenToBase: (NSPoint)screenPoint
{ {
NSPoint basePoint; NSPoint basePoint;
screenPoint = [GSCurrentContext() convertScreenToBase: screenPoint];
basePoint.x = screenPoint.x - frame.origin.x; basePoint.x = screenPoint.x - frame.origin.x;
basePoint.y = screenPoint.y - frame.origin.y; basePoint.y = screenPoint.y - frame.origin.y;