mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 18:50:48 +00:00
fixed critical bug in conversion routines
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5063 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
0175fe3359
commit
a6a9c7739c
1 changed files with 7 additions and 7 deletions
|
@ -884,7 +884,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSAffineTransform *matrix;
|
NSAffineTransform *matrix;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aPoint;
|
return aPoint;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -907,7 +907,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSAffineTransform *matrix;
|
NSAffineTransform *matrix;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aPoint;
|
return aPoint;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -930,7 +930,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSRect r;
|
NSRect r;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aRect;
|
return aRect;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -958,7 +958,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSRect r;
|
NSRect r;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aRect;
|
return aRect;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -986,7 +986,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSAffineTransform *matrix;
|
NSAffineTransform *matrix;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aSize;
|
return aSize;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -1009,7 +1009,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
|
||||||
NSAffineTransform *matrix;
|
NSAffineTransform *matrix;
|
||||||
|
|
||||||
if (!aView)
|
if (!aView)
|
||||||
aView = [window contentView];
|
aView = [[window contentView] superview];
|
||||||
if (aView == self || aView == nil)
|
if (aView == self || aView == nil)
|
||||||
return aSize;
|
return aSize;
|
||||||
NSAssert(window == [aView window], NSInvalidArgumentException);
|
NSAssert(window == [aView window], NSInvalidArgumentException);
|
||||||
|
@ -1948,7 +1948,7 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
|
||||||
NSView *v = nil, *w;
|
NSView *v = nil, *w;
|
||||||
|
|
||||||
/* If not within our frame then it can't be a hit */
|
/* If not within our frame then it can't be a hit */
|
||||||
if (![self mouse: aPoint inRect: frame])
|
if (![super_view mouse: aPoint inRect: frame])
|
||||||
return nil;
|
return nil;
|
||||||
|
|
||||||
p = [self convertPoint: aPoint fromView: super_view];
|
p = [self convertPoint: aPoint fromView: super_view];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue