mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-21 03:31:39 +00:00
Minor bugfix
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5596 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
86882fc677
commit
ab48c495ec
3 changed files with 22 additions and 18 deletions
|
@ -387,10 +387,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
|||
{
|
||||
return;
|
||||
}
|
||||
if ([window firstResponder] == self)
|
||||
{
|
||||
[window makeFirstResponder: window];
|
||||
}
|
||||
RETAIN(self);
|
||||
[super_view->sub_views removeObjectIdenticalTo: self];
|
||||
if ([super_view->sub_views count] == 0)
|
||||
|
@ -419,10 +415,6 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
|||
{
|
||||
return;
|
||||
}
|
||||
if ([window firstResponder] == self)
|
||||
{
|
||||
[window makeFirstResponder: window];
|
||||
}
|
||||
[super_view setNeedsDisplayInRect: frame];
|
||||
RETAIN(self);
|
||||
[super_view->sub_views removeObjectIdenticalTo: self];
|
||||
|
@ -519,17 +511,26 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
|||
- (void) viewWillMoveToWindow: (NSWindow*)newWindow
|
||||
{
|
||||
if (newWindow == window)
|
||||
return;
|
||||
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (_rFlags.has_draginfo)
|
||||
{
|
||||
NSGraphicsContext *ctxt = GSCurrentContext();
|
||||
NSArray *t = GSGetDragTypes(self);
|
||||
|
||||
if (window != nil)
|
||||
[ctxt _removeDragTypes: t fromWindow: [window windowNumber]];
|
||||
{
|
||||
[ctxt _removeDragTypes: t fromWindow: [window windowNumber]];
|
||||
}
|
||||
if (newWindow != nil)
|
||||
[ctxt _addDragTypes: t toWindow: [newWindow windowNumber]];
|
||||
{
|
||||
[ctxt _addDragTypes: t toWindow: [newWindow windowNumber]];
|
||||
}
|
||||
}
|
||||
if (newWindow == nil && [window firstResponder] == self)
|
||||
{
|
||||
[window makeFirstResponder: window];
|
||||
}
|
||||
|
||||
window = newWindow;
|
||||
|
@ -545,7 +546,9 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
|||
|
||||
[sub_views getObjects: array];
|
||||
for (i = 0; i < count; ++i)
|
||||
[array[i] viewWillMoveToWindow: newWindow];
|
||||
{
|
||||
[array[i] viewWillMoveToWindow: newWindow];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue