[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1330
Date       : Fri Jun 16 14:23:28 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/layer.cpp
   M /Trunk/XaraLX/Kernel/view.cpp

More printing bits


Diff:
Index: Trunk/XaraLX/Kernel/layer.cpp
===================================================================
--- Trunk/XaraLX/Kernel/layer.cpp	(revision 1329)
+++ Trunk/XaraLX/Kernel/layer.cpp	(revision 1330)
@@ -432,9 +432,7 @@
 	if (pRender->IsHitDetect() && IsLocked())
 		return SUBTREE_NORENDER;
 
-if (FALSE) {}
-PORTNOTE("printing","Layer::RenderSubtree - removed printing code  reference")
-#ifndef EXCLUDE_FROM_XARALX
+
 	// If we are printing then we do special things
 	else if (pRender->IsPrinting())
 	{
@@ -445,6 +443,8 @@
 		// Added this since we want to print what we see - might need looking at ?
 		return IsVisible() ? SUBTREE_ROOTANDCHILDREN : SUBTREE_NORENDER;
 
+PORTNOTE("printing","Layer::RenderSubtree - removed printing code  reference")
+#ifndef EXCLUDE_FROM_XARALX
 		// Otherwise, get the print control
 		
 		CCPrintInfo *pInfo = CCPrintInfo::GetCurrent();
@@ -465,9 +465,9 @@
 			// Print all foreground layers, regardless of visibility.
 			return SUBTREE_ROOTANDCHILDREN;
 		}
+#endif
 
 	}
-#endif
 	else if (IS_A(pRender,CamelotEPSRenderRegion))
 		return (IsVisible() && IsPrintable()) ? SUBTREE_ROOTANDCHILDREN : SUBTREE_NORENDER;
 	else
Index: Trunk/XaraLX/Kernel/view.cpp
===================================================================
--- Trunk/XaraLX/Kernel/view.cpp	(revision 1329)
+++ Trunk/XaraLX/Kernel/view.cpp	(revision 1330)
@@ -2413,7 +2413,7 @@
 		{
 			BOOL bIsComplex = m_bNextComplex;
 			TRACEUSER("noone", _T("OPRC# BeforeSubtree 0x%08x - %s
"), pNode, pNode->GetRuntimeClass()->GetClassName());
-			TRACEUSER("noone", _T("Hit Start of %s span
"), bIsComplex ? "complex" : "simple" );
+			TRACEUSER("noone", _T("Hit Start of %s span
"), bIsComplex ? _T("complex") : _T("simple") );
 			// If we have been doing a complex span then we need to render it now
 			if (m_bDoingComplex)
 			{


Xara