Author: mlytwyn
Date: Fri Jun 26 18:56:30 2015
New Revision: 38702
URL: http://svn.gna.org/viewcvs/gnustep?rev=38702&view=rev
Log:
GSToolTips merge
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m?rev=38702&r1=38701&r2=38702&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m Fri Jun
26 18:56:30 2015
@@ -351,7 +351,8 @@
@selector(view:stringForToolTip:point:userData:)] == YES)
{
// From testing on OS X, point is in the view's coordinate system
- // The locationInWindow has been converted to this in [NSWindow
_checkTrackingRectangles:forEvent:]
+ // The locationInWindow has been converted to this in
+ // [NSWindow _checkTrackingRectangles:forEvent:]
NSPoint p = [theEvent locationInWindow];
toolTipString = [[provider object] view: view
@@ -683,6 +684,8 @@
[(GSTTView*)([window contentView]) setText: toolTipText];
[window setFrame: rect display: NO];
[window orderFront: nil];
+ // Testplant-MAL-2015-06-26: Main branch merge...
+ // Keeping this testplant fix...
[window display];
isOpening = NO;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
