[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1144
Date       : Sat May 20 19:43:15 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/main2.cpp
   M /Trunk/XaraLX/Kernel/ndclpcnt.h
   M /Trunk/XaraLX/tools/Makefile.am
   M /Trunk/XaraLX/tools/opclip.cpp

Initialise clipviews


Diff:
Index: Trunk/XaraLX/tools/opclip.cpp
===================================================================
--- Trunk/XaraLX/tools/opclip.cpp	(revision 1143)
+++ Trunk/XaraLX/tools/opclip.cpp	(revision 1144)
@@ -101,6 +101,7 @@
 
 #include "camtypes.h"		// pre-compiled header
 #include "opclip.h"			// our header file
+#include "ophist.h"
 //#include "clipres.h"		// our resources
 //#include "phil.h"			// for _R(IDS_GREY_WHEN_SELECT_INSIDE)
 
Index: Trunk/XaraLX/tools/Makefile.am
===================================================================
--- Trunk/XaraLX/tools/Makefile.am	(revision 1143)
+++ Trunk/XaraLX/tools/Makefile.am	(revision 1144)
@@ -12,5 +12,5 @@
 	rectangl.cpp regshape.cpp eliptool.cpp oprshape.cpp filltool.cpp beztool.cpp \
 	opbezier.cpp opshadow.cpp shadtool.cpp shadinfo.cpp freeinfo.cpp opfree.cpp opdrbrsh.cpp \
 	freehand.cpp opretro.cpp moldtool.cpp bevinfo.cpp bevtool.cpp cntrtool.cpp opcntr.cpp \
-	pentool.cpp texttool.cpp textinfo.cpp textops.cpp
+	pentool.cpp texttool.cpp textinfo.cpp textops.cpp opclip.cpp
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/ndclpcnt.h
===================================================================
--- Trunk/XaraLX/Kernel/ndclpcnt.h	(revision 1143)
+++ Trunk/XaraLX/Kernel/ndclpcnt.h	(revision 1144)
@@ -105,7 +105,7 @@
 #include "group.h"		// derivation from NodeGroup
 #include "cxfrech.h"	// derivation from CamelotRecordHandler
 
-//#include "opclip.h"		// for reference to OpApplyClipView
+#include "opclip.h"		// for reference to OpApplyClipView
 
 class NodeClipView;
 class ExtendParams;
@@ -150,10 +150,7 @@
 
 // methods and classes which need to be able to invoke UpdateKeyholePath().
 friend class NodeClipView;
-PORTNOTE("other","Removed OpApplyClipView usage")
-#ifndef EXCLUDE_FROM_XARALX
 friend void OpApplyClipView::Do(OpDescriptor* pOpDesc);
-#endif
 friend class UpdateCachedKeyholePathAction;
 
 public:
Index: Trunk/XaraLX/Kernel/main2.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main2.cpp	(revision 1143)
+++ Trunk/XaraLX/Kernel/main2.cpp	(revision 1144)
@@ -294,9 +294,9 @@
 			OpMakeNodesShapes::Init() &&		// Register the OpMakeNodesShapes operation
 #ifndef EXCLUDE_FROM_XARALX
 			OpChangeBrush::Declare() &&         // Register the change brush operation
+#endif
 			OpApplyClipView::Init() &&			// Register the Apply ClipView operation
 			OpRemoveClipView::Init() &&			// Register the Remove ClipView operation
-#endif
 // Neville 5/8/97 remove Stroking code
 #ifdef VECTOR_STROKING
 			ValueFunction::Init() &&			// Init all value function classes


Xara