diff --git a/Headers/gnustep/gui/NSGraphicsContext.h b/Headers/gnustep/gui/NSGraphicsContext.h index 996767f5f..fdf210cc2 100644 --- a/Headers/gnustep/gui/NSGraphicsContext.h +++ b/Headers/gnustep/gui/NSGraphicsContext.h @@ -142,14 +142,6 @@ NSGraphicsContext *GSCurrentContext(); - (id )_dragInfo; - (void) _postExternalEvent: (NSEvent *)event; -/* - * Misc window management support. - */ -- (BOOL) _setFrame: (NSRect)frameRect forWindow: (int)winNum; -- (void) _orderWindow: (NSWindowOrderingMode)place - relativeTo: (int)otherWin - forWindow: (int)winNum; - @end #endif diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m index 9cf1b7236..eec8c1d71 100644 --- a/Source/NSGraphicsContext.m +++ b/Source/NSGraphicsContext.m @@ -334,22 +334,6 @@ NSGraphicsContext *GSCurrentContext() [self subclassResponsibility: _cmd]; } -/* - * Misc window management support. - */ -- (BOOL) _setFrame: (NSRect)frameRect forWindow: (int)winNum -{ - [self subclassResponsibility: _cmd]; - return NO; -} - -- (void) _orderWindow: (NSWindowOrderingMode)place - relativeTo: (int)otherWin - forWindow: (int)winNum -{ - [self subclassResponsibility: _cmd]; -} - @end @implementation NSGraphicsContext (Private) diff --git a/Source/NSMenu.m b/Source/NSMenu.m index 5d0c1064a..b0688a582 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -1255,7 +1255,8 @@ static NSString* NSMenuLocationsKey = @"NSMenuLocations"; NSRect frameRect = frame; frameRect.origin = aPoint; - [GSCurrentContext() _setFrame: frameRect forWindow: [self windowNumber]]; + DPSplacewindow(GSCurrentContext(), frameRect.origin.x, frameRect.origin.y, + frameRect.size.width, frameRect.size.height, [self windowNumber]); } @end diff --git a/Source/NSWindow.m b/Source/NSWindow.m index 1b3515e42..41deee817 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -658,9 +658,7 @@ static NSMapTable* windowmaps = NULL; - (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin { - [GSCurrentContext() _orderWindow: place - relativeTo: otherWin - forWindow: [self windowNumber]]; + DPSorderwindow(GSCurrentContext(), place, otherWin, [self windowNumber]); } - (void) resignKeyWindow @@ -816,7 +814,8 @@ static NSMapTable* windowmaps = NULL; * Now we can tell the graphics context to do the actual resizing. * We will recieve an event to tell us when the resize is done. */ - [GSCurrentContext() _setFrame: frameRect forWindow: [self windowNumber]]; + DPSplacewindow(GSCurrentContext(), frameRect.origin.x, frameRect.origin.y, + frameRect.size.width, frameRect.size.height, [self windowNumber]); if (flag) [self display];