gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 16:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6248 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2000-03-10 11:17:54 +00:00
parent 3b3289b25d
commit 2a879b2c2e
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Headers/gnustep/gui/NSView.h
View file

@ -335,7 +335,7 @@ enum {
*/ */
- (void) addToPageSetup; - (void) addToPageSetup;
- (void) beginPage: (int)ordinalNum - (void) beginPage: (int)ordinalNum
abel: (NSString*)aString label: (NSString*)aString
bBox: (NSRect)pageRect bBox: (NSRect)pageRect
fonts: (NSString*)fontNames; fonts: (NSString*)fontNames;
- (void) beginPageSetupRect: (NSRect)aRect - (void) beginPageSetupRect: (NSRect)aRect

22
Source/NSView.m
View file

@ -405,16 +405,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
{ {
[_window makeFirstResponder: _window]; [_window makeFirstResponder: _window];
} }
/*
* We make sure that the coordinates are invalidated even though the
* code to add this view to another view will also invalidate them.
* This is for consistency so that when a view is not in the view
* hierarchy, its coordinates should not be valid.
*/
if (aSubview->_coordinates_valid)
{
(*invalidateImp)(aSubview, invalidateSel);
}
aSubview->_super_view = nil; aSubview->_super_view = nil;
[aSubview viewWillMoveToWindow: nil]; [aSubview viewWillMoveToWindow: nil];
[_sub_views removeObjectIdenticalTo: aSubview]; [_sub_views removeObjectIdenticalTo: aSubview];
@ -520,6 +510,14 @@ GSSetDragTypes(NSView* obj, NSArray *types)
{ {
return; return;
} }
if (_coordinates_valid)
{
(*invalidateImp)(self, invalidateSel);
}
if (_rFlags.has_currects != 0)
{
[self discardCursorRects];
}
if (_rFlags.has_draginfo) if (_rFlags.has_draginfo)
{ {
NSGraphicsContext *ctxt = GSCurrentContext(); NSGraphicsContext *ctxt = GSCurrentContext();
@ -534,10 +532,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
[ctxt _addDragTypes: t toWindow: [newWindow windowNumber]]; [ctxt _addDragTypes: t toWindow: [newWindow windowNumber]];
} }
} }
if (newWindow == nil && [_window firstResponder] == self)
{
[_window makeFirstResponder: _window];
}
_window = newWindow; _window = newWindow;