[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1587
Date       : Fri Jul 28 19:41:12 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dragmgr.cpp

Make kernel drag targets iterate properly through subwindow structure
Fixes Bugzilla bug #1350 - can't drop colours on colour editor


Diff:
Index: Trunk/XaraLX/wxOil/dragmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dragmgr.cpp	(revision 1586)
+++ Trunk/XaraLX/wxOil/dragmgr.cpp	(revision 1587)
@@ -1392,8 +1392,11 @@
 					if (!AreOverTargetWnd)
 					{
 						// We're not immediately over the background of the window, but may be over
-						// a child-window of our window! 
-						wxWindow* ChildWindowUnderPoint = ::wxChildWindowFromPoint(TargetWindow, WinoilMousePos);
+						// a child-window of our window! The subtlety here is that wxChildWindowFromPoint may have
+						// failed because another window is on top (in the way). So we also check the child window
+						// of the target window which is under the mousepointer is also the window which is
+						// under the mouse pointner
+						wxWindow* ChildWindowUnderPoint = ::wxChildWindowFromPoint(TargetWindow, WinoilMousePos, false, -1);
 						AreOverTargetWnd = (ChildWindowUnderPoint != NULL &&
 												ChildWindowUnderPoint == WindowUnderPoint);
 					}
@@ -1472,7 +1475,10 @@
 					if (!AreOverTargetWnd)
 					{
 						// We're not immediately over the background of the window, but may be over
-						// a child-window of our window! 
+						// a child-window of our window! The subtlety here is that wxChildWindowFromPoint may have
+						// failed because another window is on top (in the way). So we also check the child window
+						// of the target window which is under the mousepointer is also the window which is
+						// under the mouse pointner
 						wxWindow* ChildWindowUnderPoint = ::wxChildWindowFromPoint(TargetWindow, WinoilMousePos, false, -1);
 //						TRACEUSER("Gerry", _T("ChildFromPoint = 0x%08x (%s)"), ChildWindowUnderPoint, ChildWindowUnderPoint ? ChildWindowUnderPoint->GetClassInfo()->GetClassName() : _T("null"));
 						AreOverTargetWnd = (ChildWindowUnderPoint != NULL &&


Xara