[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1385
Date       : Wed Jun 28 17:48:02 BST 2006

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

Un-PORTNOTEd BecomeAGroup


Diff:
Index: Trunk/XaraLX/Kernel/nodecomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecomp.cpp	(revision 1384)
+++ Trunk/XaraLX/Kernel/nodecomp.cpp	(revision 1385)
@@ -110,6 +110,7 @@
 //#include "resource.h"
 
 // operation headers
+#include "ophist.h"
 #include "transop.h"
 #include "attrappl.h"
 
@@ -1756,8 +1757,6 @@
 ********************************************************************************************/
 NodeGroup* NodeCompound::BecomeAGroup(UndoableOperation* pUndoOp)
 {
-	PORTNOTETRACE("other","NodeCompound::BecomeAGroup - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	// we can't do a thing without an Op...
 //	if (pUndoOp == NULL)
 //	{
@@ -1850,9 +1849,6 @@
 	}
 
 	return ok ? pGroup : NULL;
-#else
-	return NULL;
-#endif
 }
 
 


Xara