[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 859
Date : Sat Apr 22 16:42:08 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/bitfilt.cpp
M /Trunk/XaraLX/Kernel/contmenu.cpp
M /Trunk/XaraLX/Kernel/effects_stack.cpp
M /Trunk/XaraLX/Kernel/guides.cpp
M /Trunk/XaraLX/Kernel/nodebev.cpp
M /Trunk/XaraLX/Kernel/nodeblnd.cpp
M /Trunk/XaraLX/Kernel/nodebmp.cpp
M /Trunk/XaraLX/Kernel/nodecntr.cpp
M /Trunk/XaraLX/Kernel/nodemold.cpp
M /Trunk/XaraLX/Kernel/nodepath.cpp
M /Trunk/XaraLX/Kernel/noderend.cpp
M /Trunk/XaraLX/Kernel/nodershp.cpp
M /Trunk/XaraLX/Kernel/nodeshad.cpp
M /Trunk/XaraLX/Kernel/nodetxts.cpp
M /Trunk/XaraLX/Kernel/tool.h
Sorted out unicode issue with Tool optokens.
Reenabled code for building context driven menus (they aren't popped up yet)
Diff:
Index: Trunk/XaraLX/Kernel/tool.h
===================================================================
--- Trunk/XaraLX/Kernel/tool.h (revision 858)
+++ Trunk/XaraLX/Kernel/tool.h (revision 859)
@@ -157,29 +157,29 @@
// The op tokens for each of the tools
// A tool's op token is "TOOL" with the tool ID appended on the end
-#define TOOL_OPTOKEN_PUSH "TOOL3"
-#define TOOL_OPTOKEN_ZOOM "TOOL4"
-#define TOOL_OPTOKEN_RECTANGLE "TOOL5"
-#define TOOL_OPTOKEN_FREEHAND "TOOL6"
-#define TOOL_OPTOKEN_SELECTOR "TOOL7"
-#define TOOL_OPTOKEN_RECT "TOOL8"
-#define TOOL_OPTOKEN_ROTATE "TOOL9"
-#define TOOL_OPTOKEN_GRID "TOOL10"
-#define TOOL_OPTOKEN_BEZTOOL "TOOL11"
-#define TOOL_OPTOKEN_ELLIPSE "TOOL12"
-#define TOOL_OPTOKEN_GRADFILL "TOOL13"
-#define TOOL_OPTOKEN_PEN "TOOL14"
-#define TOOL_OPTOKEN_BLANK "TOOL15"
-#define TOOL_OPTOKEN_BLEND "TOOL16"
-#define TOOL_OPTOKEN_TRANSP "TOOL17"
-#define TOOL_OPTOKEN_REGSHAPE "TOOL18"
-#define TOOL_OPTOKEN_MOULD "TOOL19"
-#define TOOL_OPTOKEN_TEXT "TOOL21"
-#define TOOL_OPTOKEN_SOFTSHADOW "TOOL22"
-#define TOOL_OPTOKEN_BEVEL "TOOL23"
-#define TOOL_OPTOKEN_CONTOUR "TOOL24"
-#define TOOL_OPTOKEN_SLICE "TOOL25"
-#define TOOL_OPTOKEN_LIVEEFFECT "TOOL26"
+#define TOOL_OPTOKEN_PUSH _T("TOOL3")
+#define TOOL_OPTOKEN_ZOOM _T("TOOL4")
+#define TOOL_OPTOKEN_RECTANGLE _T("TOOL5")
+#define TOOL_OPTOKEN_FREEHAND _T("TOOL6")
+#define TOOL_OPTOKEN_SELECTOR _T("TOOL7")
+#define TOOL_OPTOKEN_RECT _T("TOOL8")
+#define TOOL_OPTOKEN_ROTATE _T("TOOL9")
+#define TOOL_OPTOKEN_GRID _T("TOOL10")
+#define TOOL_OPTOKEN_BEZTOOL _T("TOOL11")
+#define TOOL_OPTOKEN_ELLIPSE _T("TOOL12")
+#define TOOL_OPTOKEN_GRADFILL _T("TOOL13")
+#define TOOL_OPTOKEN_PEN _T("TOOL14")
+#define TOOL_OPTOKEN_BLANK _T("TOOL15")
+#define TOOL_OPTOKEN_BLEND _T("TOOL16")
+#define TOOL_OPTOKEN_TRANSP _T("TOOL17")
+#define TOOL_OPTOKEN_REGSHAPE _T("TOOL18")
+#define TOOL_OPTOKEN_MOULD _T("TOOL19")
+#define TOOL_OPTOKEN_TEXT _T("TOOL21")
+#define TOOL_OPTOKEN_SOFTSHADOW _T("TOOL22")
+#define TOOL_OPTOKEN_BEVEL _T("TOOL23")
+#define TOOL_OPTOKEN_CONTOUR _T("TOOL24")
+#define TOOL_OPTOKEN_SLICE _T("TOOL25")
+#define TOOL_OPTOKEN_LIVEEFFECT _T("TOOL26")
const UINT32 TOOLID_MAX = 99;
Index: Trunk/XaraLX/Kernel/nodeshad.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeshad.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodeshad.cpp (revision 859)
@@ -157,7 +157,7 @@
#include "gdraw.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "blndhelp.h"
#include "osrndrgn.h"
//#include "progress.h"
@@ -3054,15 +3054,11 @@
********************************************************************************************/
BOOL NodeShadow::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
- PORTNOTE("other","NodeShadow::OnNodePopUp - do nothing")
-#ifndef EXCLUDE_FROM_XARALX
BOOL ok = TRUE;
#ifndef NO_ADVANCED_TOOLS
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_SOFTSHADOW, TRUE);
#endif
return ok;
-#endif
- return FALSE;
}
Index: Trunk/XaraLX/Kernel/nodeblnd.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 859)
@@ -114,7 +114,7 @@
#include "nodebldr.h"
#include "app.h"
#include "blobs.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "blndtool.h"
#include "tool.h"
#include "ndbldpth.h"
@@ -2051,7 +2051,7 @@
//WEBSTER-ranbirr-01/12/96
#ifndef WEBSTER
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
BOOL ok = TRUE;
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_BLEND, TRUE);
Index: Trunk/XaraLX/Kernel/nodebev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebev.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodebev.cpp (revision 859)
@@ -139,7 +139,7 @@
#include "cmxrendr.h" // For the CMXRenderRegion custom export code.
//#include "ai_epsrr.h" // For the AIEPSRenderRegion custom export code.
#include "rsmooth.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "blndhelp.h"
#include "offscrn.h"
#include "scanrr.h"
@@ -3922,11 +3922,9 @@
BOOL ok = TRUE;
PORTNOTETRACE("other","NodeBevel::ExportRender - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
#ifndef NO_ADVANCED_TOOLS
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_BEVEL, TRUE);
#endif
-#endif
return ok;
}
Index: Trunk/XaraLX/Kernel/nodecntr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecntr.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodecntr.cpp (revision 859)
@@ -127,7 +127,7 @@
//#include "mario.h"
#include "rsmooth.h"
#include "fitcurve.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "blndhelp.h"
#include "brshattr.h"
#include "pbecomea.h"
@@ -2116,12 +2116,7 @@
BOOL NodeContour::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
- PORTNOTETRACE("other","NodeShadow::OnNodePopUp - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
return pMenu->BuildCommand(TOOL_OPTOKEN_CONTOUR, TRUE);
-#else
- return FALSE;
-#endif
}
Index: Trunk/XaraLX/Kernel/nodershp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodershp.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodershp.cpp (revision 859)
@@ -109,7 +109,7 @@
//#include "cameleps.h"
//#include "nativeps.h" // The old style EPS native filter, used in v1.1
//#include "swfrndr.h" // For the Flash render region class.
-//#include "contmenu.h"
+#include "contmenu.h"
#include "docview.h"
#include "fillval.h"
#include "nodepath.h"
@@ -4201,11 +4201,9 @@
BOOL NodeRegularShape::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
BOOL ok = TRUE;
-PORTNOTE("other","Removed ContextMenu usage")
-#ifndef EXCLUDE_FROM_XARALX
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_REGSHAPE, TRUE);
ok = ok && pMenu->BuildCommand(OPTOKEN_TOGGLEELIPPOLY, TRUE);
@@ -4222,7 +4220,6 @@
ok = ok && pMenu->BuildCommand(OPTOKEN_QUICKSHAPE_NUMBERSIDES8, FALSE, pNumberRoot);
ok = ok && pMenu->BuildCommand(OPTOKEN_QUICKSHAPE_NUMBERSIDES9, FALSE, pNumberRoot);
ok = ok && pMenu->BuildCommand(OPTOKEN_QUICKSHAPE_NUMBERSIDES10, FALSE, pNumberRoot);
-#endif
return ok;
#else
Index: Trunk/XaraLX/Kernel/guides.cpp
===================================================================
--- Trunk/XaraLX/Kernel/guides.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/guides.cpp (revision 859)
@@ -124,7 +124,7 @@
//#include "markn.h"
//#include "ed.h"
//#include "tim.h"
-//#include "contmenu.h"
+#include "contmenu.h"
//#include "lyrprop.h"
//#include "resource.h"
#include "usercord.h"
@@ -137,7 +137,7 @@
#include "nativeps.h" // The old style EPS native filter, used in v1.1
#include "keypress.h"
#include "prpsgds.h"
-//#include "snapops.h"
+#include "snapops.h"
//#include "viewrc.h"
#include "csrstack.h"
//#include "justin.h"
@@ -816,7 +816,7 @@
#ifndef WEBSTER
BOOL ok = TRUE;
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
// set up data required for ops which could be invoked
GuidelinePropDlg::SetEditGuidelineParams(this);
OpDeleteGuideline::SetGuideline(this);
Index: Trunk/XaraLX/Kernel/nodemold.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodemold.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodemold.cpp (revision 859)
@@ -139,7 +139,7 @@
//#include "resource.h" // For _R(IDS_OK)/CANCEL
//#include "will.h"
//#include "tim.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "pathedit.h"
#include "moldedit.h"
@@ -3126,14 +3126,12 @@
// WEBSTER-ranbirr-01/12/96
#ifndef WEBSTER
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_MOULD, TRUE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_DETACHMOULD, FALSE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_ROTATEMOULD, FALSE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_COPYMOULD, TRUE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_RECTANGULARENVELOPE, FALSE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_RECTANGULARPERSPECTIVE, TRUE);
-#endif
#endif //webster
return ok;
Index: Trunk/XaraLX/Kernel/nodebmp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebmp.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodebmp.cpp (revision 859)
@@ -159,9 +159,9 @@
//#include "cmxexdc.h"
// for popup menu
-//#include "contmenu.h"
+#include "contmenu.h"
//#include "bfxdlg.h"
-//#include "tracedlg.h"
+#include "tracedlg.h"
//This includes the Hot Link class
#include "userattr.h"
@@ -519,15 +519,13 @@
********************************************************************************************/
BOOL NodeBitmap::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
-PORTNOTE("other","OnNodePopUp - Remove ContextMenu")
-
#if !defined(EXCLUDE_FROM_RALPH)
BOOL ok = TRUE;
-#if !defined(EXCLUDE_FROM_XARALX)
-
+#ifndef EXCLUDE_FROM_XARALX
ok = ok && pMenu->BuildCommand(OPTOKEN_XPE_EDIT, FALSE);
+#endif
//ok = ok && pMenu->BuildCommand(OPTOKEN_BFXDLG, FALSE);
@@ -549,8 +547,6 @@
ok = ok && pMenu->BuildCommand(OPTOKEN_TRACEDLG, TRUE);
-#endif // !defined(EXCLUDE_FROM_XARALX)
-
return ok;
#else // !defined(EXCLUDE_FROM_RALPH)
Index: Trunk/XaraLX/Kernel/contmenu.cpp
===================================================================
--- Trunk/XaraLX/Kernel/contmenu.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/contmenu.cpp (revision 859)
@@ -470,7 +470,7 @@
if (pStack->IsEmpty() || !pStack->bConsistent)
return TRUE;
- BuildCommand( wxT(TOOL_OPTOKEN_LIVEEFFECT) ); // Go to Effects tool
+ BuildCommand( TOOL_OPTOKEN_LIVEEFFECT ); // Go to Effects tool
pStack->BuildEffectMenu(this); // <List of effects>
Index: Trunk/XaraLX/Kernel/effects_stack.cpp
===================================================================
--- Trunk/XaraLX/Kernel/effects_stack.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/effects_stack.cpp (revision 859)
@@ -1329,7 +1329,7 @@
********************************************************************************************/
BOOL EffectsStack::BuildEffectMenu(ContextMenu* pMenu)
{
-PORTNOTE("menu", "BuildEffectMenu can't do anything until the menu system works");
+PORTNOTE("menu", "BuildEffectMenu can't do anything until we have XPEHost::GetEffectDetails or equivalent");
#ifndef EXCLUDE_FROM_XARALX
PPStackLevel* pItem = (PPStackLevel*)GetHead();
// PPStackLevel* pNextItem = NULL;
Index: Trunk/XaraLX/Kernel/nodetxts.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetxts.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodetxts.cpp (revision 859)
@@ -108,7 +108,7 @@
#include "becomea.h"
#include "blobs.h"
//#include "cameleps.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "docview.h"
#include "fillattr.h"
#include "group.h"
@@ -3412,7 +3412,7 @@
BOOL TextStory::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
BOOL ok = TRUE;
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_TEXT, TRUE);
// ok = ok && pMenu->BuildCommand(OPTOKEN_APPLYLEFTJUSTIFY);
Index: Trunk/XaraLX/Kernel/bitfilt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bitfilt.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/bitfilt.cpp (revision 859)
@@ -3051,7 +3051,7 @@
Info.ErrorMsg = _R(IDT_BMPEXP_NOSELECTION);
Info.Button[0] = _R(IDB_EXPQUERY_EXPORT);
Info.Button[1] = _R(IDB_EXPQUERY_DONTEXPORT);
- if (AskQuestion(&Info) == _R(IDB_EXPQUERY_DONTEXPORT))
+ if ((ResourceID)AskQuestion(&Info) == _R(IDB_EXPQUERY_DONTEXPORT))
{
Error::SetError(_R(IDN_USER_CANCELLED),0); // Expects error set on cancel
return FALSE; // if cancelled
Index: Trunk/XaraLX/Kernel/noderend.cpp
===================================================================
--- Trunk/XaraLX/Kernel/noderend.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/noderend.cpp (revision 859)
@@ -146,7 +146,7 @@
#include "lineattr.h"
#include "grndrgn.h" // for REAL_GDRAW
#include "snap.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "becomea.h"
#include "nodetext.h"
#include "nodetxtl.h"
Index: Trunk/XaraLX/Kernel/nodepath.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodepath.cpp (revision 858)
+++ Trunk/XaraLX/Kernel/nodepath.cpp (revision 859)
@@ -107,7 +107,7 @@
#include "becomea.h"
#include "blobs.h"
-//#include "contmenu.h"
+#include "contmenu.h"
#include "lineattr.h"
#include "ophist.h"
#include "opbreak.h"
@@ -870,7 +870,7 @@
BOOL NodePath::OnBlobPopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
DocRect BlobRect;
DocCoord* Coords = InkPath.GetCoordArray();
PathFlags* Flags = InkPath.GetFlagArray();
@@ -933,7 +933,7 @@
********************************************************************************************/
BOOL NodePath::OnNodePopUp(Spread* pSpread, DocCoord PointerPos, ContextMenu* pMenu)
{
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
BOOL ok = TRUE;
ok = ok && pMenu->BuildCommand(TOOL_OPTOKEN_BEZTOOL, TRUE);
Xara