[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1159
Date       : Mon May 22 17:07:26 BST 2006

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

Re-instated shadow/ungroup warning while shadows cannot be factored out due to effects code being PORTNOTE excluded.
Fixes BZ992


Diff:
Index: Trunk/XaraLX/Kernel/groupops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/groupops.cpp	(revision 1158)
+++ Trunk/XaraLX/Kernel/groupops.cpp	(revision 1159)
@@ -738,8 +738,15 @@
 		// then post a message informing the user.
 		if (pParent->IsABevelController())
 			MessageID = _R(IDS_GROUPINSIDEBEVEL);
+PORTNOTE("other", "Ungroup can't localise effects yet")
+#ifndef EXCLUDE_FROM_XARALX
+// We don't need this clause when shadows can be localised in ungroup
 //		else if (pParent->IsAShadowController())	// Shadows are now PostProcessors and allow ungrouping
 //			MessageID = _R(IDS_GROUPINSIDESHADOW);
+#else
+		else if (pParent->IsAShadowController())	// Shadows are now PostProcessors and allow ungrouping
+			MessageID = _R(IDS_GROUPINSIDESHADOW);
+#endif
 		else if (pParent->IsAContourController())
 			MessageID = _R(IDS_GROUPINSIDECONTOUR);
 


Xara