[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1478
Date       : Wed Jul 19 15:44:48 BST 2006

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

Removed incorrect temporary bodge in CaretNode::DiscardsAttributeChildren and added missing comment. Both these things were out of line with the Xtreme source...


Diff:
Index: Trunk/XaraLX/Kernel/nodetext.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetext.cpp	(revision 1477)
+++ Trunk/XaraLX/Kernel/nodetext.cpp	(revision 1478)
@@ -2973,13 +2973,18 @@
 	Returns:	TRUE
 	Purpose:	When attributes are applied to the caret, we cannot generate undo info
 				as children of the CaretNode are thrown away in a non-undoable way.
+
+	Notes:		Phil, 24/09/2005
+				The usage of this function has changed subtly today. It used to prevent
+				both attribute optimisation and undo recording on Caret nodes.
+				As of today it just prevents undo recording - attribute optimisation
+				goes ahead like normal on Caret nodes so that they behave more consistently.
+
 ********************************************************************************************/
 
 BOOL CaretNode::DiscardsAttributeChildren() const
 {
-// TEMP TEST! Allow caret to respond normally to attribute application! [Phil, 14/08/2005]
-return FALSE;
-//	return TRUE;
+	return TRUE;
 }
 
 


Xara