[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1392
Date       : Fri Jun 30 10:59:55 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/selector.cpp
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp

Fixed problems with guideline pointer update in Selector tool. (Made DialogManager::GetWindowUnderPointer return ClientCoords as we'd normally get in window events.)


Diff:
Index: Trunk/XaraLX/tools/selector.cpp
===================================================================
--- Trunk/XaraLX/tools/selector.cpp	(revision 1391)
+++ Trunk/XaraLX/tools/selector.cpp	(revision 1392)
@@ -845,7 +845,8 @@
 //	ClickStart = dcPos;
 
 	// If there isn't any selection, or it's in a different spread, then do nothing.
-	if (SelectionSpread == NULL || SelectionSpread != pSpread) return;
+//	if (SelectionSpread == NULL || SelectionSpread != pSpread)
+//		return;
 	
 	String_256 str;
 	Cursor* pPointerShape;
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1391)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1392)
@@ -7488,8 +7488,9 @@
 {
 	wxPoint pt=wxGetMousePosition();
 	wxWindow * w=::wxChildWindowFromPoint(pt, FALSE, -1);
-	if (wc)
+	if (wc && w)
 	{
+		pt = w->ScreenToClient(pt);
 		wc->x=pt.x;
 		wc->y=pt.y;
 	}


Xara