[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 892
Date : Wed Apr 26 13:07:08 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/barcreationdlg.cpp
M /Trunk/XaraLX/Kernel/bitfilt.cpp
M /Trunk/XaraLX/Kernel/camfiltr.cpp
M /Trunk/XaraLX/Kernel/cutop.cpp
M /Trunk/XaraLX/Kernel/extendsetsdlg.cpp
M /Trunk/XaraLX/Kernel/fthrattr.cpp
M /Trunk/XaraLX/Kernel/menuops.cpp
M /Trunk/XaraLX/Kernel/nbevcont.cpp
M /Trunk/XaraLX/Kernel/ncntrcnt.cpp
M /Trunk/XaraLX/Kernel/node.cpp
M /Trunk/XaraLX/Kernel/nodebev.cpp
M /Trunk/XaraLX/Kernel/nodeblnd.cpp
M /Trunk/XaraLX/Kernel/nodecntr.cpp
M /Trunk/XaraLX/Kernel/nodecont.cpp
M /Trunk/XaraLX/Kernel/nodemldr.cpp
M /Trunk/XaraLX/Kernel/nodepath.cpp
M /Trunk/XaraLX/Kernel/nodeshad.cpp
M /Trunk/XaraLX/Kernel/nodetxts.cpp
M /Trunk/XaraLX/Kernel/opbarcreation.cpp
M /Trunk/XaraLX/Kernel/ops.cpp
M /Trunk/XaraLX/Kernel/range.cpp
M /Trunk/XaraLX/Kernel/slice.cpp
M /Trunk/XaraLX/Kernel/slicehelper.cpp
M /Trunk/XaraLX/Kernel/undoop.cpp
M /Trunk/XaraLX/tools/selector.cpp
M /Trunk/XaraLX/tools/slicetool.cpp
M /Trunk/XaraLX/wxOil/keypress.cpp
Uncommented some name gallery usage and made some rather dubious usage slightly safer (the gallery is /not/ guaranteed to exist)
Diff:
Index: Trunk/XaraLX/tools/selector.cpp
===================================================================
--- Trunk/XaraLX/tools/selector.cpp (revision 891)
+++ Trunk/XaraLX/tools/selector.cpp (revision 892)
@@ -498,61 +498,10 @@
// This should be set to NULL by default. It will be set properly below, if
// everthing is working as it should
pInfoBarOp = new SelectorInfoBarOp;
-
-#pragma message( __LOCMSG__ "Removed NameGallery usage" )
-/* // Now we have to declare all our operations and if that works, try to find
- // the freehand tools info bar and create it
- CCResTextFile ResFile;
- SelectorInfoBarOpCreate BarCreate;
- if (ResFile.open(_R(IDM_SELECTOR_BAR), _R(IDT_INFO_BAR_RES)))
- {
- // Found the file and opened it
- if (DialogBarOp::ReadBarsFromFile(ResFile,BarCreate))
- {
- // Info bar now exists. Now get a pointer to it
- String_32 str = String_32(_R(IDS_SELECTOR_INFOBARNAME));
- DialogBarOp* pDialogBarOp = DialogBarOp::FindDialogBarOp(str);
-
- // Should have a dialog bar op by now
- if (pDialogBarOp != NULL)
- {
- // Make sure it is what we were expecting and set it
- if (pDialogBarOp->IsKindOf(CC_RUNTIME_CLASS(SelectorInfoBarOp)))
- {
- pInfoBarOp = (SelectorInfoBarOp*) pDialogBarOp;
- }
- else
- {
- ENSURE(FALSE, "Wrong kind of info-bar in SelectorTool::Init");
- pInfoBarOp = NULL;
- }
- }
- #ifdef _DEBUG
- else
- {
- TRACE( _T("Couldn't find DialogBarOp for Selector tool info-bar!"));
- }
- #endif
- }
- #ifdef _DEBUG
- else
- {
- TRACE( _T("Couldn't read selector tool info-bar description from file."));
- }
- #endif
- // Finished with file so close it
- ResFile.close();
- }
-#ifdef _DEBUG
- else
- {
- TRACE( _T("Couldn't open selector tool info-bar description file."));
- }
-#endif
// In the debug version make sure we can create a bar.
ENSURE(pInfoBarOp != NULL, "Failed to create selector tool info-bar");
- if (pInfoBarOp == NULL) return FALSE; */
+ if (pInfoBarOp == NULL) return FALSE;
// Get a permanent pointer to the blob manager.
pBlobManager = GetApplication()->GetBlobManager();
Index: Trunk/XaraLX/tools/slicetool.cpp
===================================================================
--- Trunk/XaraLX/tools/slicetool.cpp (revision 891)
+++ Trunk/XaraLX/tools/slicetool.cpp (revision 892)
@@ -2571,7 +2571,8 @@
// call the name-gallery to update named set info.
NameGallery* pNameGallery = NameGallery::Instance();
- pNameGallery->FastUpdateNamedSetSizes();
+ if (pNameGallery)
+ pNameGallery->FastUpdateNamedSetSizes();
// decide what set-selection info we'll be displaying.
INT32 nSetSelection = SliceHelper::DoesSelectionOnlyContainCompleteSets();
@@ -2874,7 +2875,8 @@
NewBarData.IsLive = !NewBarData.IsLive;
NameGallery * pNameGallery = NameGallery::Instance();
- pNameGallery->FastUpdateNamedSetSizes();
+ if (pNameGallery)
+ pNameGallery->FastUpdateNamedSetSizes();
pNodeBarProperty->MakeChange(BarNumber, NewBarData);
}
@@ -2937,7 +2939,8 @@
{
// this will be a new set of named sets!
NameGallery * pNameGallery = NameGallery::Instance();
- pNameGallery->FastUpdateNamedSetSizes();
+ if (pNameGallery)
+ pNameGallery->FastUpdateNamedSetSizes();
}
}
Index: Trunk/XaraLX/Kernel/nodemldr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodemldr.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodemldr.cpp (revision 892)
@@ -119,7 +119,7 @@
#include "fillattr.h" // For AttrFillGeometry::MakePerspective()
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "strkattr.h"
#include "ophist.h"
@@ -1580,10 +1580,8 @@
UndoableOperation* pChangeOp = pParam->GetOpPointer();
if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
{
-PORTNOTE("other","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
- allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
+ if (NameGallery::Instance())
+ allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
Index: Trunk/XaraLX/Kernel/ncntrcnt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 892)
@@ -146,7 +146,7 @@
#include "ppbevel.h"
//#include "cstatbar.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
//#include "blendatt.h"
#include "blndhelp.h"
//#include "mario.h"
@@ -1329,10 +1329,8 @@
UndoableOperation* pChangeOp = pParam->GetOpPointer();
if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
{
- PORTNOTETRACE("other","NodeContourController::AllowOp - removed call to PreTriggerEdit");
-#ifndef EXCLUDE_FROM_XARALX
- allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
+ if (NameGallery::Instance())
+ allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
Index: Trunk/XaraLX/Kernel/opbarcreation.cpp
===================================================================
--- Trunk/XaraLX/Kernel/opbarcreation.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/opbarcreation.cpp (revision 892)
@@ -649,53 +649,56 @@
// get their names and work out the translations to line up a new state
NameGallery * pNameGallery = NameGallery::Instance();
- pNameGallery->FastUpdateNamedSetSizes(); // make sure we are using the most up-to-date data
+ if (pNameGallery)
+ {
+ pNameGallery->FastUpdateNamedSetSizes(); // make sure we are using the most up-to-date data
+
+ SGUsedNames* pNames = pNameGallery->GetUsedNames();
+ SGNameItem* pNameGalleryItem = pNames ? (SGNameItem*) pNames->GetChild() : NULL;
- SGUsedNames* pNames = pNameGallery->GetUsedNames();
- SGNameItem* pNameGalleryItem = pNames ? (SGNameItem*) pNames->GetChild() : NULL;
-
-
- while (pNameGalleryItem)
- {
- if (pNameGalleryItem->m_BarNumber == BarNo && !pNameGalleryItem->IsEmpty() && !pNameGalleryItem->IsABackBar())
+
+ while (pNameGalleryItem)
{
- // set the name
- pNameGalleryItem->GetNameText(&(ButtonData[ButtonsInitialised].Name));
- ButtonData[ButtonsInitialised].HaveCreatedProperty = FALSE;
-
- // Matt 19/12/2000
- // If the LiveStretching check box is turned on, then we should reposition the buttons relative to the centre of their set bounds.
- // If not, then we should position them central to where their set bounds on THIS layer are...
- // This is so that you can change some colours (etc) on one state, click 'SetNewDesign' and be sure that your button isn't
- // about to realign itself centrally to its set (when this may not have been appropriate)
- BOOL LiveStretching = FALSE;
- NodeBarProperty* pNodeBarProperty = (NodeBarProperty*) Document::GetCurrent()->GetSetSentinel()->FindBarProperty();
- BarDataType NewBarData = pNodeBarProperty->Bar(BarNo);
- if (pNodeBarProperty && BarNo < pNodeBarProperty->HowMany())
+ if (pNameGalleryItem->m_BarNumber == BarNo && !pNameGalleryItem->IsEmpty() && !pNameGalleryItem->IsABackBar())
{
- LiveStretching = NewBarData.IsLive;
+ // set the name
+ pNameGalleryItem->GetNameText(&(ButtonData[ButtonsInitialised].Name));
+ ButtonData[ButtonsInitialised].HaveCreatedProperty = FALSE;
+
+ // Matt 19/12/2000
+ // If the LiveStretching check box is turned on, then we should reposition the buttons relative to the centre of their set bounds.
+ // If not, then we should position them central to where their set bounds on THIS layer are...
+ // This is so that you can change some colours (etc) on one state, click 'SetNewDesign' and be sure that your button isn't
+ // about to realign itself centrally to its set (when this may not have been appropriate)
+ BOOL LiveStretching = FALSE;
+ NodeBarProperty* pNodeBarProperty = (NodeBarProperty*) Document::GetCurrent()->GetSetSentinel()->FindBarProperty();
+ BarDataType NewBarData = pNodeBarProperty->Bar(BarNo);
+ if (pNodeBarProperty && BarNo < pNodeBarProperty->HowMany())
+ {
+ LiveStretching = NewBarData.IsLive;
+ }
+
+ // If LiveStretching is not enabled or the bar does not require shuffling (ie user positioned)
+ if ((!LiveStretching || !NewBarData.RequiresShuffle) && !IgnoreSettings)
+ {
+ // Unfortunately, I now want to know where the old version of this button was... I need to know this so that I can position the new buttons with
+ // their new designs in the same place as the original ones so as to minimise on-screen fun... Also, we should use this in the case of User Positioned
+ // buttons so that we don't turn them into Vertical Bars everytime the user clicks 'Set New Design' - not very user positioned!
+ ButtonData[ButtonsInitialised].Translation.x = oldbuttoncentres[ButtonsInitialised].x - SelCentre.x;
+ ButtonData[ButtonsInitialised].Translation.y = oldbuttoncentres[ButtonsInitialised].y - SelCentre.y;
+ }
+ else
+ {
+ // position to new button state on top of the other button states
+ ButtonData[ButtonsInitialised].Translation.x = pNameGalleryItem->GetSetBounds().Centre().x - SelCentre.x;
+ ButtonData[ButtonsInitialised].Translation.y = pNameGalleryItem->GetSetBounds().Centre().y - SelCentre.y;
+ }
+
+ ButtonsInitialised++;
+
}
-
- // If LiveStretching is not enabled or the bar does not require shuffling (ie user positioned)
- if ((!LiveStretching || !NewBarData.RequiresShuffle) && !IgnoreSettings)
- {
- // Unfortunately, I now want to know where the old version of this button was... I need to know this so that I can position the new buttons with
- // their new designs in the same place as the original ones so as to minimise on-screen fun... Also, we should use this in the case of User Positioned
- // buttons so that we don't turn them into Vertical Bars everytime the user clicks 'Set New Design' - not very user positioned!
- ButtonData[ButtonsInitialised].Translation.x = oldbuttoncentres[ButtonsInitialised].x - SelCentre.x;
- ButtonData[ButtonsInitialised].Translation.y = oldbuttoncentres[ButtonsInitialised].y - SelCentre.y;
- }
- else
- {
- // position to new button state on top of the other button states
- ButtonData[ButtonsInitialised].Translation.x = pNameGalleryItem->GetSetBounds().Centre().x - SelCentre.x;
- ButtonData[ButtonsInitialised].Translation.y = pNameGalleryItem->GetSetBounds().Centre().y - SelCentre.y;
- }
-
- ButtonsInitialised++;
-
+ pNameGalleryItem = (SGNameItem *) pNameGalleryItem->GetNext();
}
- pNameGalleryItem = (SGNameItem *) pNameGalleryItem->GetNext();
}
// init buttons that haven't been seen yet working out their new names and their locations
Index: Trunk/XaraLX/Kernel/cutop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/cutop.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/cutop.cpp (revision 892)
@@ -1315,13 +1315,10 @@
ok = FALSE;
else
{
-PORTNOTE("other","Removed SGNameItem::GetProperty usage")
-#ifndef EXCLUDE_FROM_XARALX
// is it a target?
NamedStretchProp* pProp = (NamedStretchProp*)pGalleryItem->GetProperty(NamedStretchProp::nIndex);
if (pProp && !pProp->GetTriggers().empty())
ok = FALSE;
-#endif
}
}
else
Index: Trunk/XaraLX/Kernel/nodeshad.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeshad.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodeshad.cpp (revision 892)
@@ -153,7 +153,7 @@
#include "blobs.h"
#include "attrmap.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "gdraw.h"
@@ -2894,18 +2894,16 @@
// If we're ok so far and were asked to do a PreTriggerEdit, then
// determine whether the Op may change the bounds of some nodes.
// If it may, then call NameGallery::PreTriggerEdit.
-PORTNOTETRACE("NameGallery", "Use of NameGallery removed in NodeShadowController::AllowOp");
-#if !defined(EXCLUDE_FROM_XARALX)
if (allowed && DoPreTriggerEdit)
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
{
- allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
+ if (NameGallery::Instance())
+ allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
-#endif
return allowed;
}
Index: Trunk/XaraLX/Kernel/nodeblnd.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodeblnd.cpp (revision 892)
@@ -128,7 +128,7 @@
//#include "opshadow.h"
//#include "opbevel.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "brshattr.h"
#include "slicehelper.h"
@@ -1943,10 +1943,8 @@
UndoableOperation* pChangeOp = pParam->GetOpPointer();
if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
{
- PORTNOTETRACE("other","NodeBlend::AllowOp - removed call to PreTriggerEdit");
-#ifndef EXCLUDE_FROM_XARALX
- allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
+ if (NameGallery::Instance())
+ allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
Index: Trunk/XaraLX/Kernel/nodebev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebev.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodebev.cpp (revision 892)
@@ -146,7 +146,7 @@
#include "opgrad.h"
//#include "princomp.h"
#include "strkattr.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "slicehelper.h"
#include "brshattr.h"
#include "fthrattr.h" // for AttrFeather
@@ -3671,11 +3671,8 @@
// if we're ok so far and were asked to do a PreTriggerEdit, then
// determine whether the Op may change the bounds of some nodes.
// If it may, then call NameGallery::PreTriggerEdit.
-PORTNOTE("other","Removed NameGallery from NodeBevel::GetBlobBoundingRect");
-#ifndef EXCLUDE_FROM_XARALX
- if (DoPreTriggerEdit && pChangeOp && pChangeOp->MayChangeNodeBounds())
+ if (DoPreTriggerEdit && pChangeOp && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
// return result (directly, or indirectly via a child AllowOp()) to op
Index: Trunk/XaraLX/Kernel/nbevcont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nbevcont.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nbevcont.cpp (revision 892)
@@ -149,7 +149,7 @@
#include "nodeblnd.h"
#include "spread.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "blendatt.h"
#include "blndhelp.h"
#include "nodebldr.h"
@@ -2401,18 +2401,15 @@
// if we're ok so far and were asked to do a PreTriggerEdit, then
// determine whether the Op may change the bounds of some nodes.
// If it may, then call NameGallery::PreTriggerEdit.
-PORTNOTE("other","Removed NameGallery from NodeBevelController::AllowOp");
-#ifndef EXCLUDE_FROM_XARALX
if (allowed && DoPreTriggerEdit)
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
-#endif
return allowed;
}
Index: Trunk/XaraLX/Kernel/nodecntr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecntr.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodecntr.cpp (revision 892)
@@ -135,7 +135,7 @@
#include "gclip.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
CC_IMPLEMENT_DYNCREATE(NodeContour, NodeRenderableInk)
@@ -1961,12 +1961,9 @@
// if we're ok so far and were asked to do a PreTriggerEdit, then
// determine whether the Op may change the bounds of some nodes.
// If it may, then call NameGallery::PreTriggerEdit.
- if (DoPreTriggerEdit && pChangeOp && pChangeOp->MayChangeNodeBounds())
+ if (DoPreTriggerEdit && pChangeOp && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("other","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
Index: Trunk/XaraLX/Kernel/slice.cpp
===================================================================
--- Trunk/XaraLX/Kernel/slice.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/slice.cpp (revision 892)
@@ -368,7 +368,7 @@
// find the defined slices
NameGallery* pNameGallery = NameGallery::Instance();
- SGUsedNames* pNames = pNameGallery->GetUsedNames();
+ SGUsedNames* pNames = pNameGallery?NameGallery->GetUsedNames():NULL;
if (!pNames)
{
Index: Trunk/XaraLX/Kernel/nodecont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecont.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodecont.cpp (revision 892)
@@ -141,7 +141,7 @@
#include "ncntrcnt.h"
#include "document.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "cmxrendr.h"
//#include "cmxexdc.h"
@@ -445,18 +445,15 @@
// If we're ok so far and were asked to do a PreTriggerEdit, then
// determine whether the Op may change the bounds of some nodes.
// If it may, then call NameGallery::PreTriggerEdit.
-PORTNOTETRACE("NameGallery", "Use of NameGallery removed in NodeShadowController::AllowOp");
-#if !defined(EXCLUDE_FROM_XARALX)
if (allowed && DoPreTriggerEdit)
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
}
}
-#endif
return allowed;
}
Index: Trunk/XaraLX/Kernel/camfiltr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/camfiltr.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/camfiltr.cpp (revision 892)
@@ -203,8 +203,8 @@
#include "ngsentry.h" // NodeSetSentinel
#include "slicehelper.h"// for slice helper static functions - layer merging
-//#include "ngcore.h" // For name gallery code.
-//#include "ngitem.h" // For named item code.
+#include "ngcore.h" // For name gallery code.
+#include "ngitem.h" // For named item code.
//#include "opbevel.h"
#include "brshattr.h"
#include "ndclpcnt.h" // ClipViewRecordHandler
@@ -4315,19 +4315,9 @@
BOOL ok = TRUE;
// Set up the name gallery, using Simon's code, and check that it's valid
-PORTNOTE("namegallery", "Removed use of NameGallery")
-#ifndef EXCLUDE_FROM_XARALX
NameGallery *pNameGallery = NameGallery::Instance ();
- if ( pNameGallery == NULL )
- {
- // Inform the caller that an error has occurred.
- ok = FALSE;
- }
-
- // Update the named set information if everythings ok.
- if (ok)
+ if ( pNameGallery)
pNameGallery->FastUpdateNamedSetSizes ();
-#endif
// Karim 08/02/2001
// Set the document up to save out shadows correctly.
Index: Trunk/XaraLX/Kernel/menuops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/menuops.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/menuops.cpp (revision 892)
@@ -1110,7 +1110,7 @@
ERRORIF(!NumSidesOp, _R(IDE_NOMORE_MEMORY), FALSE);
-PORTNOTE("other","Removed NameGallery usage")
+PORTNOTE("other","Removed bitmap effects usage")
#ifndef EXCLUDE_FROM_XARALX
OpDescriptor* EditEffectOp = new OpDescriptor(
0,
Index: Trunk/XaraLX/Kernel/ops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ops.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/ops.cpp (revision 892)
@@ -158,7 +158,7 @@
#include "userattr.h"
#include "tmpltatr.h"
-//#include "ngcore.h"
+#include "ngcore.h"
//#include "ngsetop.h"
CC_IMPLEMENT_MEMDUMP(ActionList, List)
@@ -1493,19 +1493,19 @@
OpStatus = UNDO;
UndoActions.ExecuteBackwards(FALSE);
BOOL fSuccess = !OpFlags.Failed;
+PORTNOTE("other","Removed OpChangeBarProperty usage")
+#ifndef EXCLUDE_FROM_XARALX
if (fSuccess)
{
-PORTNOTE("dialog","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
NameGallery* pNameGallery = NameGallery::Instance();
- if (pNameGallery != 0)
+ if (pNameGallery)
{
pNameGallery->PreTriggerEdit((UndoableOperation*) this, 0, (Node*) 0);
if (IS_A(this, OpChangeBarProperty))
pNameGallery->m_TouchedBar = ((OpChangeBarProperty*) this)->m_BarIndex;
}
+ }
#endif
- }
End(); // End the operation properly, remember that this may delete the operation
return fSuccess;
@@ -1539,7 +1539,7 @@
BOOL fSuccess = !OpFlags.Failed;
if (fSuccess)
{
-PORTNOTE("dialog","Removed NameGallery usage")
+PORTNOTE("other","Removed OpChangeBarProperty usage")
#ifndef EXCLUDE_FROM_XARALX
NameGallery* pNameGallery = NameGallery::Instance();
if (pNameGallery != 0)
Index: Trunk/XaraLX/Kernel/undoop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/undoop.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/undoop.cpp (revision 892)
@@ -139,7 +139,7 @@
#include "layermsg.h" // layer messages for redraw layer message in debug builds
#endif
-//#include "ngcore.h" // for NameGallery stretching implementation.
+#include "ngcore.h" // for NameGallery stretching implementation.
#include "chapter.h"
#include "opdupbar.h"
@@ -4349,12 +4349,9 @@
// When querying the Op responsible for the change, I've decided to use 'this'.
// Could've asked pParam for the Op's pointer, but 'this' is probably more reliable.
UndoableOperation* pChangeOp = this;// pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("dialog","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
NameGallery::Instance()->PostTriggerEdit(pChangeOp, pParam);
-#endif
}
}
/////////////////////////////////////////////////////////////////////////////////////////
Index: Trunk/XaraLX/Kernel/nodetxts.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetxts.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodetxts.cpp (revision 892)
@@ -135,7 +135,7 @@
#include "impstr.h"
#include "unicdman.h"
#include "extender.h" // for ExtendParams
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
// Resource headers
//#include "mario.h"
@@ -692,12 +692,9 @@
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("dialog","Remove reference to NameGallery")
-#ifndef EXCLUDE_FROM_XARALX
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
@@ -1524,12 +1521,9 @@
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("dialog","Remove reference to NameGallery")
-#ifndef EXCLUDE_FROM_XARALX
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
Index: Trunk/XaraLX/Kernel/bitfilt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bitfilt.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/bitfilt.cpp (revision 892)
@@ -296,7 +296,7 @@
********************************************************************************************/
BOOL BaseBitmapFilter::InitBaseClass()
{
-PORTNOTE("filters","Removed NameGallery usage")
+PORTNOTE("filters","Removed BitmapExportOptions usage")
#ifndef EXCLUDE_FROM_XARALX
return BitmapExportOptions::Declare();
#else
Index: Trunk/XaraLX/Kernel/fthrattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fthrattr.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/fthrattr.cpp (revision 892)
@@ -2137,7 +2137,6 @@
//
// The only way to detect whether we're being transformed as above, is to test on the Op.
-PORTNOTE("other","Removed NameGallery usage")
if (pOp->IS_KIND_OF(TransOperation)
&& !pOp->IsKindOf( CC_RUNTIME_CLASS(OpPathNudge) )
)
Index: Trunk/XaraLX/Kernel/barcreationdlg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/barcreationdlg.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/barcreationdlg.cpp (revision 892)
@@ -2072,7 +2072,8 @@
NameGallery* pNameGallery = NameGallery::Instance();
// make sure we are dealing with the most uptodate information
- pNameGallery->FastUpdateNamedSetSizes();
+ if (pNameGallery)
+ pNameGallery->FastUpdateNamedSetSizes();
String_256 BarName = "";
Index: Trunk/XaraLX/Kernel/slicehelper.cpp
===================================================================
--- Trunk/XaraLX/Kernel/slicehelper.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/slicehelper.cpp (revision 892)
@@ -109,8 +109,8 @@
#include "tmpltatr.h"
// named set stuff
-//#include "ngcore.h"
-//#include "ngitem.h"
+#include "ngcore.h"
+#include "ngitem.h"
//#include "simon.h" // for the _R(IDS_ROLLOVER_DEFAULT) etc
//#include "sliceres.h" // more resources
@@ -126,7 +126,7 @@
//#include "nodetext.h"
#include "nodecntr.h"
-//#include "layergal.h" // for the vis layer action
+#include "layergal.h" // for the vis layer action
// need to know about shadows and bevels since they size funny for the GetNodeBounding()
#include "nodeshad.h"
@@ -135,6 +135,8 @@
#include "lineattr.h" // for the line width inclusion part of the GetNodeBounding()
+#include "ophist.h"
+
// global that is set when a bar property tag is imported to say how many bars there were beforehand
// used by SliceHelper::MeshImportedLayersWithExistingButtonBars() and is defined in rechdoc.cpp
extern INT32 g_NoOfBarsBeforeImport;
@@ -364,8 +366,6 @@
********************************************************************************************/
SGNameItem* SliceHelper::LookupNameGalleryItem(const StringBase & strName)
{
- PORTNOTETRACE("dialog","SliceHelper::LookupNameGalleryItem - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
NameGallery * pNameGallery = NameGallery::Instance();
SGUsedNames* pNames = pNameGallery ? pNameGallery->GetUsedNames() : NULL;
SGNameItem* pNameGalleryItem = pNames ? (SGNameItem*) pNames->GetChild() : NULL;
@@ -383,7 +383,6 @@
// no then try the next one?
pNameGalleryItem = (SGNameItem *) pNameGalleryItem->GetNext();
}
-#endif
return NULL;
}
@@ -406,8 +405,6 @@
********************************************************************************************/
void SliceHelper::GetNextFreeButtonName(INT32 &butno, StringBase * pStr)
{
- PORTNOTETRACE("dialog","SliceHelper::GetNextFreeButtonName - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
String_256 TempButtonName;
SGNameItem* pNGItem = NULL;
SGNameItem* pNGItemExtender = NULL;
@@ -434,7 +431,6 @@
if (pStr)
*pStr = TempButtonName;
-#endif
}
/********************************************************************************************
@@ -582,16 +578,11 @@
BOOL SliceHelper::SelectObjectsInSet(const StringBase& strName,
SelectScan::Change eNewState)
{
- PORTNOTETRACE("dialog","SliceHelper::SelectObjectsInSet - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
SGNameItem* pItem = SliceHelper::LookupNameGalleryItem(strName);
if (pItem == 0) return FALSE;
SelectScan scanner(pItem, eNewState);
scanner.Scan();
return TRUE;
-#else
- return FALSE;
-#endif
}
@@ -987,12 +978,12 @@
********************************************************************************************/
void SliceHelper::MeshImportedLayersWithExistingButtonBars(Node * pImportedLayer[5], UndoableOperation * pUndoableOp, BOOL Imported)
{
- PORTNOTETRACE("dialog","SliceHelper::MeshImportedLayersWithExistingButtonBars - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
INT32 BarReplacedWithBar[MAX_IMPORTED_BARS]; // 255 bars the max to import into a document
memset (BarReplacedWithBar, -1, sizeof(BarReplacedWithBar));
NameGallery* pNameGallery = NameGallery::Instance();
+ if (!pNameGallery)
+ return;
pNameGallery->FastUpdateNamedSetSizes(); // update the existing names in the gallery
String_256 Postfix; // holds the "Extender" postfix
@@ -1202,7 +1193,7 @@
AlreadyUsed = IsUniqueName(NewButtonName, &ExistingAttrList);
if (AlreadyUsed)
- NewButtonName += "x";
+ NewButtonName += _T("x");
}while (AlreadyUsed);
}
@@ -1274,7 +1265,7 @@
AlreadyUsed = IsUniqueName(NewExtender, &ExistingAttrList);
if (AlreadyUsed)
- NewExtender += "x";
+ NewExtender += _T("x");
}while (AlreadyUsed);
@@ -1450,10 +1441,10 @@
if (pBarPropertyCopy)
{
- if (pBarPropertyCopy->HowMany() <= BarReplacedWithBar[i])
+ if ((INT32)(pBarPropertyCopy->HowMany()) <= BarReplacedWithBar[i])
{
UINT32 tempuint = 0;
- while ((pBarPropertyCopy->HowMany() <= BarReplacedWithBar[i]) && tempuint != UINT_MAX)
+ while (((INT32)(pBarPropertyCopy->HowMany()) <= BarReplacedWithBar[i]) && tempuint != UINT_MAX)
tempuint = pBarPropertyCopy->Add(pBarPropertyCopy->Bar(i));
}
else
@@ -1520,7 +1511,7 @@
// Ensure that the Trigger sets are correctly flagged...
SliceHelper::EnsureTriggerInfo();
-#endif
+
}
@@ -1681,8 +1672,6 @@
UndoableOperation* pOp,
NodeSetProperty * pExampleProp)
{
- PORTNOTETRACE("dialog","SliceHelper::CreatePropertiesForSet - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
NodeSetSentinel * pSentinel = Document::GetSelected()->GetSetSentinel();
if (!pSentinel)
@@ -1884,7 +1873,6 @@
( Action**)(&UndoHideNodeAction));
}
-#endif
return TRUE;
}
@@ -2357,8 +2345,6 @@
BOOL SliceHelper::SyncTextLines (TextLine * pLine1, TextLine * pLine2, UndoableOperation * pOp)
{
- PORTNOTETRACE("dialog","SliceHelper::SyncTextLines - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
Node * pChar1 = pLine1->FindFirstChild(CC_RUNTIME_CLASS(TextChar));
Node * pChar2 = pLine2->FindFirstChild(CC_RUNTIME_CLASS(TextChar));
@@ -2568,7 +2554,6 @@
}
TRACEUSER( "Matt", _T("Done
"));
-#endif
return TRUE;
}
@@ -2803,8 +2788,6 @@
// find out if the rect r intersects with any bars (sjk 27/6/00)
void SliceHelper::BarNameInRect(DocRect r, String_256 *pBarName)
{
- PORTNOTETRACE("dialog","SliceHelper::BarNameInRect - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
NameGallery * pNameGallery = NameGallery::Instance();
if (!pNameGallery)
return;
@@ -2824,14 +2807,11 @@
}
pNameGalleryItem = (SGNameItem *) pNameGalleryItem->GetNext();
}
-#endif
}
// add an action to show this Layer undoably (sjk 6/7/00)
void SliceHelper::ShowLayer(BOOL Visible, Layer * pLayer, Spread * pSpread, UndoableOperation * pUndoOp)
{
- PORTNOTETRACE("dialog","SliceHelper::ShowLayer - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
// dont put in the undo action if we have done nothing
if (pLayer->IsVisible() == Visible)
return;
@@ -2841,7 +2821,6 @@
Param.NewState = Visible;
Param.pLayer = pLayer;
LayerStateAction::Init(pUndoOp, pUndoOp->GetUndoActions(), Param);
-#endif
}
// uses the name gallery data to work out if the selection
@@ -2852,8 +2831,6 @@
// sjk 7/7/00
INT32 SliceHelper::DoesSelectionOnlyContainCompleteSets()
{
- PORTNOTETRACE("dialog","SliceHelper::DoesSelectionOnlyContainCompleteSets - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
NameGallery * pNameGallery = NameGallery::Instance();
if (!pNameGallery)
return 2;
@@ -2882,9 +2859,6 @@
}
return ret;
-#else
- return 2;
-#endif
}
// Small function to scan the tree looking for a named object
@@ -3069,8 +3043,6 @@
BOOL SliceHelper::ModifySelectionToContainWholeButtonElements()
{
- PORTNOTETRACE("dialog","SliceHelper::ModifySelectionToContainWholeButtonElements - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
// Get a pointer to the NameGallery, and make sure it is up-to-date
NameGallery *pNameGallery = NameGallery::Instance();
pNameGallery->FastUpdateNamedSetSizes();
@@ -3117,7 +3089,7 @@
// Retrieve the current node from the NodeListItem...
pNode = pItem->pNode;
- for (pAttr = (TemplateAttribute*)pNode->FindFirstAttr(Node::IsAnObjectName); pAttr; pAttr = (TemplateAttribute*)pAttr->FindNextAttr(Node::IsAnObjectName))
+ for (pAttr = (TemplateAttribute*)pNode->FindFirstAttr(&Node::IsAnObjectName); pAttr; pAttr = (TemplateAttribute*)pAttr->FindNextAttr(&Node::IsAnObjectName))
{
// This may seem a redundant check - but it's not! When we find that all of one layer has been selected
// we select all of the layer and update the NameGallery - if we check within this 'for' loop, then
@@ -3189,7 +3161,7 @@
}
// Select ALL LAYERS of this named set...
- TRACEUSER( "Matt", _T("ALL of %s on layer selected
"),StrName);
+ TRACEUSER( "Matt", _T("ALL of %s on layer selected
"),(TCHAR *)StrName);
SelectScan scanner(pNameGalleryItem, SelectScan::SELECT);
scanner.Scan();
@@ -3222,7 +3194,6 @@
// Then our procedure has altered the selection, so we'd better update it!
GetApplication()->FindSelection()->Update();
}
-#endif
return TRUE;
}
@@ -3427,8 +3398,6 @@
********************************************************************************************/
void SliceHelper::EnsureTriggerInfo()
{
- PORTNOTETRACE("dialog","SliceHelper::EnsureTriggerInfo - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
NameGallery *pNameGallery = NameGallery::Instance();
SGUsedNames* pNames = pNameGallery->GetUsedNames();
@@ -3474,5 +3443,4 @@
// Get the next item and try again...
pNameGalleryItem = (SGNameItem *) pNameGalleryItem->GetNext();
}
-#endif
}
Index: Trunk/XaraLX/Kernel/nodepath.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodepath.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/nodepath.cpp (revision 892)
@@ -132,7 +132,7 @@
//#include "mario.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "gdraw.h"
//#include "rndrgn.h"
@@ -2344,13 +2344,9 @@
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("dialog","Removed NameGallery usage")
-// Nested exclude
-#ifndef EXCLUDE_FROM_XARALX
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
if (SetOpPermissionState)
Index: Trunk/XaraLX/Kernel/extendsetsdlg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/extendsetsdlg.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/extendsetsdlg.cpp (revision 892)
@@ -494,6 +494,8 @@
{
// iterate over all names used within the document.
NameGallery* pNameGallery = NameGallery::Instance();
+ if (!pNameGallery)
+ return TRUE;
SGUsedNames* pNames = pNameGallery->GetUsedNames();
SGNameItem* pItem = (SGNameItem*) pNames->GetChild();
Index: Trunk/XaraLX/Kernel/node.cpp
===================================================================
--- Trunk/XaraLX/Kernel/node.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/node.cpp (revision 892)
@@ -121,7 +121,7 @@
#include "nodetxts.h"
#include "extender.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "group.h"
#ifdef RALPH
@@ -5242,12 +5242,9 @@
if(DoPreTriggerEdit)
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("other","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
allowed = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
}
Index: Trunk/XaraLX/Kernel/range.cpp
===================================================================
--- Trunk/XaraLX/Kernel/range.cpp (revision 891)
+++ Trunk/XaraLX/Kernel/range.cpp (revision 892)
@@ -133,7 +133,7 @@
#include "toolmsg.h"
#include "comattrmsg.h"
#include "qualattr.h"
-//#include "ngcore.h" // NameGallery, for stretching functionality
+#include "ngcore.h" // NameGallery, for stretching functionality
#include "objchge.h" // for ues of ObjChangeParam
//#include "scrvw.h"
//#include "will2.h"
@@ -2368,12 +2368,9 @@
{
// if the Op is non-NULL then query its MayChangeNodeBounds() method.
UndoableOperation* pChangeOp = pParam->GetOpPointer();
- if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds())
+ if (pChangeOp != NULL && pChangeOp->MayChangeNodeBounds() && NameGallery::Instance())
{
-PORTNOTE("dialog","Removed NameGallery usage")
-#ifndef EXCLUDE_FROM_XARALX
result = NameGallery::Instance()->PreTriggerEdit(pChangeOp, pParam, this);
-#endif
}
}
Index: Trunk/XaraLX/wxOil/keypress.cpp
===================================================================
--- Trunk/XaraLX/wxOil/keypress.cpp (revision 891)
+++ Trunk/XaraLX/wxOil/keypress.cpp (revision 892)
@@ -316,7 +316,7 @@
return;
}
-#pragma message( __LOCMSG__ "Removed NameGallery usage" )
+#pragma message( __LOCMSG__ "Removed some keypress mangling" )
#if 0
RepeatCount = KeyData & 0xffff;
ScanCode = (KeyData >> 16) & 0xff;
Xara