[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 860
Date       : Sat Apr 22 16:52:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/Makefile.am
   M /Trunk/XaraLX/Kernel/docview.cpp
   M /Trunk/XaraLX/Kernel/nodepath.cpp
   M /Trunk/XaraLX/Kernel/viewmenu.cpp

Fixed pop-up menus so they work


Diff:
Index: Trunk/XaraLX/Kernel/docview.cpp
===================================================================
--- Trunk/XaraLX/Kernel/docview.cpp	(revision 859)
+++ Trunk/XaraLX/Kernel/docview.cpp	(revision 860)
@@ -145,7 +145,7 @@
 //#include "dragcol.h"
 //#include "mainfrm.h"
 #include "zoomops.h"
-//#include "viewmenu.h"
+#include "viewmenu.h"
 #include "menuops.h"
 #include "clikmods.h"
 #include "nodetext.h"
@@ -3374,10 +3374,9 @@
 					pManager->CheckHaveDetailsOnPlugIns();
 #endif // PHOTOSHOPPLUGINS
 				
-#pragma message( __LOCMSG__ "Removed ViewContextMenu usage" )
-/*				// Pop up the context sensitive view menu.
+				// Pop up the context sensitive view menu.
 				ViewContextMenu* pViewPopup = new ViewContextMenu;
-				pViewPopup->ShowOverView(pSpread, DocPos, Mods); */
+				pViewPopup->ShowOverView(pSpread, DocPos, Mods);
 			}
 #endif
 		}
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 859)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 860)
@@ -61,6 +61,6 @@
 	penedit.cpp aligndlg.cpp exjpeg.cpp aboutdlg.cpp sgdrag.cpp sginit.cpp sgtree.cpp \
 	bmpprefs.cpp expbmp.cpp expcol.cpp prvwflt.cpp bmpexdoc.cpp webop.cpp \
 	zdeflate.cpp jpgdest.cpp webparam.cpp bmpalint.cpp zdftrees.cpp animparams.cpp \
-	sglayer.cpp layermgr.cpp layergal.cpp backgrnd.cpp
+	sglayer.cpp layermgr.cpp layergal.cpp backgrnd.cpp viewmenu.cpp
 
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/viewmenu.cpp
===================================================================
--- Trunk/XaraLX/Kernel/viewmenu.cpp	(revision 859)
+++ Trunk/XaraLX/Kernel/viewmenu.cpp	(revision 860)
@@ -105,7 +105,7 @@
 #include "viewmenu.h"
 #include "tool.h"
 #include "menuops.h"
-#include "coldlog.h"
+//#include "coldlog.h"
 #include "snapops.h"
 #include "app.h"
 #include "ink.h"
@@ -120,7 +120,7 @@
 #include "opimgset.h"
 #include "hlinkdlg.h"
 #include "layergal.h"	// OPTOKEN_DELETEPAGEBACKGROUND
-#include "brushdlg.h"
+//#include "brushdlg.h"
 #include "brushop.h"
 #include "cutop.h"		// OPTOKEN_PASTE	matt-23/08/2000
 
@@ -234,8 +234,11 @@
 	#endif //webster
 			// Utils commands
 			ok = ok && BuildCommand(OPTOKEN_WEBADDRESSDLG);
+PORTNOTE("other", "Removed colour edit dialog and brush edit dialog from popup menu")
+#ifndef EXCLUDE_FROM_XARALX
 			ok = ok && BuildCommand(OPTOKEN_COLOUREDITDLG,TRUE);
 			ok = ok && BuildCommand(OPTOKEN_BRUSHEDIT_DLG);
+#endif
 			ok = ok && BuildCommand(OPTOKEN_SELECTBRUSH);
 		}
 
Index: Trunk/XaraLX/Kernel/nodepath.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodepath.cpp	(revision 859)
+++ Trunk/XaraLX/Kernel/nodepath.cpp	(revision 860)
@@ -872,9 +872,9 @@
 {
 #if !defined(EXCLUDE_FROM_RALPH)
 	DocRect    BlobRect;
-	DocCoord*  Coords = InkPath.GetCoordArray();
-	PathFlags* Flags  = InkPath.GetFlagArray();
-	PathVerb*  Verbs  = InkPath.GetVerbArray();
+//	DocCoord*  Coords = InkPath.GetCoordArray();
+//	PathFlags* Flags  = InkPath.GetFlagArray();
+//	PathVerb*  Verbs  = InkPath.GetVerbArray();
 
 	// Should always be able to get selected view
 	DocView *pDocView = DocView::GetSelected();
@@ -887,7 +887,7 @@
 	if (!InkPath.IsSubSelection())
 		return FALSE;
 
-	INT32 NumCoords = InkPath.GetNumCoords();
+//	INT32 NumCoords = InkPath.GetNumCoords();
 	INT32 i;
 	if (InkPath.FindNearestPoint(	PointerPos, 
 									POINTFLAG_ENDPOINTS | 


Xara