[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 895
Date       : Wed Apr 26 14:49:43 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/ngsetop.cpp

2nd attempt to fix build failure


Diff:
Index: Trunk/XaraLX/Kernel/ngsetop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ngsetop.cpp	(revision 894)
+++ Trunk/XaraLX/Kernel/ngsetop.cpp	(revision 895)
@@ -202,8 +202,10 @@
 
 void OpSelectUnionSets::Do(OpDescriptor*)
 {
-	SelectUnionScan(KeyPress::IsGalleryCtrlPressed() ? SelectUnionScan::DESELECT : 
-		SelectUnionScan::SELECT_EXCLUSIVE).Scan();
+	INT32 option = SelectUnionScan::SELECT_EXCLUSIVE;
+	if( KeyPress::IsGalleryCtrlPressed() )
+		option = SelectUnionScan::DESELECT;
+	SelectUnionScan( option ).Scan();
 	End();
 }
 
@@ -237,9 +239,10 @@
 
 void OpSelectIntersectSets::Do(OpDescriptor*)
 {
-	SelectIntersectScan(KeyPress::IsGalleryCtrlPressed()
-							? SelectIntersectScan::DESELECT
-							: SelectIntersectScan::SELECT_EXCLUSIVE).Scan();
+	INT32 option = SelectUnionScan::SELECT_EXCLUSIVE;
+	if( KeyPress::IsGalleryCtrlPressed() )
+		option = SelectUnionScan::DESELECT;
+	SelectUnionScan( option ).Scan();
 	End();
 }
 


Xara