[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1361
Date : Sun Jun 25 17:43:52 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/Makefile.am
M /Trunk/XaraLX/Kernel/app.cpp
M /Trunk/XaraLX/Kernel/app.h
M /Trunk/XaraLX/Kernel/appprefs.cpp
M /Trunk/XaraLX/Kernel/attr.cpp
M /Trunk/XaraLX/Kernel/attrmgr.cpp
M /Trunk/XaraLX/Kernel/basedoc.h
M /Trunk/XaraLX/Kernel/bmpcomp.cpp
M /Trunk/XaraLX/Kernel/brshattr.cpp
M /Trunk/XaraLX/Kernel/clipattr.cpp
M /Trunk/XaraLX/Kernel/csrstack.cpp
M /Trunk/XaraLX/Kernel/document.cpp
M /Trunk/XaraLX/Kernel/fontcomp.h
M /Trunk/XaraLX/Kernel/fthrattr.cpp
M /Trunk/XaraLX/Kernel/grid.cpp
M /Trunk/XaraLX/Kernel/isetattr.cpp
M /Trunk/XaraLX/Kernel/layer.cpp
M /Trunk/XaraLX/Kernel/ncntrcnt.cpp
M /Trunk/XaraLX/Kernel/ndclpcnt.cpp
M /Trunk/XaraLX/Kernel/ndmldgrp.cpp
M /Trunk/XaraLX/Kernel/node.cpp
M /Trunk/XaraLX/Kernel/nodebmp.cpp
M /Trunk/XaraLX/Kernel/nodeclip.cpp
M /Trunk/XaraLX/Kernel/nodecntr.cpp
M /Trunk/XaraLX/Kernel/nodecomp.cpp
M /Trunk/XaraLX/Kernel/nodecont.cpp
M /Trunk/XaraLX/Kernel/nodemold.cpp
M /Trunk/XaraLX/Kernel/nodershp.cpp
M /Trunk/XaraLX/Kernel/nodeshad.cpp
M /Trunk/XaraLX/Kernel/nodeshap.cpp
M /Trunk/XaraLX/Kernel/nodetext.cpp
M /Trunk/XaraLX/Kernel/npaper.cpp
M /Trunk/XaraLX/Kernel/offattr.cpp
M /Trunk/XaraLX/Kernel/ops.cpp
M /Trunk/XaraLX/Kernel/paths.cpp
M /Trunk/XaraLX/Kernel/pbecomea.cpp
M /Trunk/XaraLX/Kernel/prnprefs.cpp
M /Trunk/XaraLX/Kernel/quality.cpp
M /Trunk/XaraLX/Kernel/rndrgn.h
M /Trunk/XaraLX/Kernel/spread.cpp
M /Trunk/XaraLX/Kernel/strkattr.cpp
M /Trunk/XaraLX/Kernel/toollist.cpp
M /Trunk/XaraLX/Kernel/txtattr.cpp
M /Trunk/XaraLX/Kernel/webattr.cpp
M /Trunk/XaraLX/tools/blndtool.cpp
M /Trunk/XaraLX/tools/opliveeffects.h
M /Trunk/XaraLX/tools/selector.cpp
M /Trunk/XaraLX/wxOil/basebar.h
M /Trunk/XaraLX/wxOil/dibconv.cpp
M /Trunk/XaraLX/wxOil/dockbar.h
M /Trunk/XaraLX/wxOil/grndrgn.h
M /Trunk/XaraLX/wxOil/keypress.cpp
M /Trunk/XaraLX/wxOil/offscrn.h
M /Trunk/XaraLX/wxOil/oilmods.cpp
M /Trunk/XaraLX/wxOil/sgindgen.cpp
Removed many bogus pragmas. Added print options code
Diff:
Index: Trunk/XaraLX/tools/opliveeffects.h
===================================================================
--- Trunk/XaraLX/tools/opliveeffects.h (revision 1360)
+++ Trunk/XaraLX/tools/opliveeffects.h (revision 1361)
@@ -225,7 +225,7 @@
See also:
********************************************************************************************/
-//#pragma message( __LOCMSG__ "Removed OpLiveEffect - derived from SelSelOperation" )
+
class OpLiveEffect : public SelOperation
{
// Give my name out in memory dumps.
Index: Trunk/XaraLX/tools/selector.cpp
===================================================================
--- Trunk/XaraLX/tools/selector.cpp (revision 1360)
+++ Trunk/XaraLX/tools/selector.cpp (revision 1361)
@@ -120,7 +120,7 @@
#include "selector.h"
#include "selinfo.h"
//#include "fillattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "progress.h"
+#include "progress.h"
#include "keypress.h"
#include "vkextra.h"
#include "insertnd.h"
@@ -1020,9 +1020,10 @@
DocCoord dcMousePos;
if( DocView::GetCurrentMousePos( &pSpread, &dcMousePos ) &&
Tool::GetCurrentID()== TOOLID_SELECTOR )
-#pragma message( __LOCMSG__ "Removed NameGallery usage" )
- /* &&
- !BaseBar::IsDragging()) */
+PORTNOTE("other", "Removed bar drag usage")
+#ifndef EXCLUDE_FROM_XARALX
+ && !BaseBar::IsDragging())
+#endif
{
// StartSpread = pSpread;
// ClickStart = dcMousePos;
@@ -5834,8 +5835,7 @@
RenderDragBlobs(BoundingRect, StartSpread, bSolidDrag);
// Put the hourglass up
-#pragma message( __LOCMSG__ "Removed BeginSlowJob usage" )
-// BeginSlowJob();
+ BeginSlowJob();
// Go and try and select a few things
if (Success)
@@ -6117,8 +6117,7 @@
Spread* pSpread, BOOL fDragOK, BOOL bSolidDrag)
{
// Put the hourglass up
-#pragma message( __LOCMSG__ "Removed BeginSlowJob usage" )
-// BeginSlowJob();
+ BeginSlowJob();
// Act on the termination status of the drag operation.
if (fDragOK)
Index: Trunk/XaraLX/tools/blndtool.cpp
===================================================================
--- Trunk/XaraLX/tools/blndtool.cpp (revision 1360)
+++ Trunk/XaraLX/tools/blndtool.cpp (revision 1361)
@@ -585,9 +585,6 @@
{
if (ClickMods.Menu) return; // Don't do anything if the user clicked the Menu button
-//#pragma message( __LOCMSG__ "BlendTool::OnClick - do nothing" )
-// TRACE( _T("Warning - BlendTool::OnClick called
") );
-
ERROR3IF_PF(pSpread==NULL,("pSpread is NULL"));
if (Click == CLICKTYPE_DRAG)
Index: Trunk/XaraLX/Kernel/isetattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/isetattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/isetattr.cpp (revision 1361)
@@ -348,8 +348,6 @@
void OverprintLineAttrValue::Render(RenderRegion *pRegion, BOOL Temp)
{
// Stack the current overprint attribute and set ourselves up as the new one
-//#pragma message( __LOCMSG__ "OverprintLineAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - OverprintLineAttrValue::Render called
") );
pRegion->SetLineOverprint(this, Temp);
}
@@ -376,8 +374,6 @@
void OverprintLineAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "OverprintLineAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - OverprintLineAttrValue::Restore called
") );
pRegion->RestoreLineOverprint(this, Temp);
}
@@ -859,8 +855,6 @@
void OverprintFillAttrValue::Render(RenderRegion *pRegion, BOOL Temp)
{
// Stack the current overprint attribute and set ourselves up as the new one
-//#pragma message( __LOCMSG__ "OverprintFillAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - OverprintFillAttrValue::Render called
") );
pRegion->SetFillOverprint(this, Temp);
}
@@ -887,8 +881,6 @@
void OverprintFillAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "OverprintFillAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - OverprintFillAttrValue::Restore called
") );
pRegion->RestoreFillOverprint(this, Temp);
}
@@ -1370,8 +1362,6 @@
void PrintOnAllPlatesAttrValue::Render(RenderRegion *pRegion, BOOL Temp)
{
// Stack the current overprint attribute and set ourselves up as the new one
-//#pragma message( __LOCMSG__ "PrintOnAllPlatesAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - PrintOnAllPlatesAttrValue::Render called
") );
pRegion->SetPrintOnAllPlates(this, Temp);
}
@@ -1398,8 +1388,6 @@
void PrintOnAllPlatesAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "PrintOnAllPlatesAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - PrintOnAllPlatesAttrValue::Restore called
") );
pRegion->RestorePrintOnAllPlates(this, Temp);
}
Index: Trunk/XaraLX/Kernel/ncntrcnt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/ncntrcnt.cpp (revision 1361)
@@ -428,8 +428,6 @@
***********************************************************************************************/
void NodeContourController::Render(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "NodeContourController::Render - do nothing" )
-// TRACE( _T("Warning - NodeContourController::Render called
") );
if (m_bInsetPath)
{
PathProcessor * pProc = pRender->GetFirstPathProcessor();
@@ -496,9 +494,6 @@
***********************************************************************************************/
SubtreeRenderState NodeContourController::RenderSubtree(RenderRegion* pRender, Node** ppNextNode, BOOL bClip)
{
-//#pragma message( __LOCMSG__ "NodeContourController::RenderSubtree - do nothing" )
-// TRACE( _T("Warning - NodeContourController::RenderSubtree called
") );
-// return SUBTREE_ROOTANDCHILDREN;
if (m_bInsetPath && pRender!=NULL && !pRender->IsPrinting())
{
// create & push the path processor
@@ -3086,8 +3081,6 @@
RenderRegion * pRegion,
PathShape ShapePath )
{
-//#pragma message( __LOCMSG__ "ContourNodeTreeFactory::ProcessPath - do nothing" )
-// TRACE( _T("Warning - ContourNodeTreeFactory::ProcessPath called
") );
UINT32 StrokeWidth = 0;
if (m_bActive && pPath->IsClosed())
@@ -3405,8 +3398,6 @@
RenderRegion *pRender,
PathShape ShapePath)
{
-//#pragma message( __LOCMSG__ "ContourNodeTreeFactory::ProcessPath - do nothing" )
-// TRACE( _T("Warning - ContourNodeTreeFactory::ProcessPath called
") );
if (m_bActive)
return;
Index: Trunk/XaraLX/Kernel/attr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/attr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/attr.cpp (revision 1361)
@@ -407,8 +407,6 @@
void LineWidthAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "LineWidthAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - LineWidthAttribute::Render called
") );
pRegion->SetLineWidth(this, Temp);
}
@@ -431,8 +429,6 @@
void LineWidthAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "LineWidthAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - LineWidthAttribute::Restore called
") );
pRegion->RestoreLineWidth(this, Temp);
}
@@ -690,8 +686,6 @@
void DashPatternAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "DashPatternAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - LineWidthAttribute::Render called
") );
pRegion->SetDashPattern(this, Temp);
}
@@ -712,8 +706,6 @@
void DashPatternAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "DashPatternAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - LineWidthAttribute::Restore called
") );
pRegion->RestoreDashPattern(this, Temp);
}
@@ -1576,15 +1568,11 @@
void EndArrowAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "EndArrowAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - EndArrowAttribute::Render called
") );
pRegion->SetEndArrow(this, Temp);
}
void EndArrowAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "EndArrowAttribute::Restore - do nothing" );
-// TRACE( wxT("Warning - EndArrowAttribute::Restore called
") );
pRegion->RestoreEndArrow(this, Temp);
}
@@ -1683,8 +1671,6 @@
void DrawingModeAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "DrawingModeAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - DrawingModeAttribute::Render called
") );
pRegion->SetDrawingMode(this, Temp);
}
@@ -1707,8 +1693,6 @@
void DrawingModeAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "DrawingModeAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - DrawingModeAttribute::Restore called
") );
pRegion->RestoreDrawingMode(this, Temp);
}
@@ -1753,15 +1737,11 @@
void MitreLimitAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "MitreLimitAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - MitreLimitAttribute::Restore called
") );
pRegion->RestoreMitreLimit(this, Temp);
}
void MitreLimitAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "MitreLimitAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - MitreLimitAttribute::Render called
") );
pRegion->SetMitreLimit(this, Temp);
}
@@ -1824,15 +1804,11 @@
void WindingRuleAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "WindingRuleAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - WindingRuleAttribute::Restore called
") );
pRegion->RestoreWindingRule(this, Temp);
}
void WindingRuleAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "WindingRuleAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - WindingRuleAttribute::Render called
") );
pRegion->SetWindingRule(this, Temp);
}
@@ -1904,15 +1880,11 @@
void StartCapAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StartCapAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - StartCapAttribute::Restore called
") );
pRegion->RestoreStartCap(this, Temp);
}
void StartCapAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StartCapAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - StartCapAttribute::Render called
") );
pRegion->SetStartCap(this, Temp);
}
@@ -1967,15 +1939,11 @@
void JoinTypeAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "JoinTypeAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - JoinTypeAttribute::Restore called
") );
pRegion->RestoreJoinType(this, Temp);
}
void JoinTypeAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "JoinTypeAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - JoinTypeAttribute::Render called
") );
pRegion->SetJoinType(this, Temp);
}
@@ -2018,15 +1986,11 @@
void StartArrowAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StartArrowAttribute::Render - do nothing" )
-// TRACE( wxT("Warning - StartArrowAttribute::Render called
") );
pRegion->SetStartArrow(this, Temp);
}
void StartArrowAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StartArrowAttribute::Restore - do nothing" )
-// TRACE( wxT("Warning - StartArrowAttribute::Restore called
") );
pRegion->RestoreStartArrow(this, Temp);
}
Index: Trunk/XaraLX/Kernel/strkattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/strkattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/strkattr.cpp (revision 1361)
@@ -695,8 +695,6 @@
void StrokeTypeAttrValue::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StrokeTypeAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - StrokeTypeAttrValue::Render called
") );
// Stack the current attribute and set ourselves up as the new one
pRegion->SetStrokeType(this, Temp);
@@ -732,8 +730,6 @@
void StrokeTypeAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "StrokeTypeAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - StrokeTypeAttrValue::Restore called
") );
pRegion->RestoreStrokeType(this, Temp);
}
@@ -767,8 +763,6 @@
void StrokeTypeAttrValue::GoingOutOfScope(RenderRegion *pRegion)
{
-//#pragma message( __LOCMSG__ "StrokeTypeAttrValue::GoingOutOfScope - do nothing" )
-// TRACE( _T("Warning - StrokeTypeAttrValue::GoingOutOfScope called
") );
if (pProcessor != NULL)
pRegion->PopPathProcessor();
}
@@ -1479,8 +1473,6 @@
void VariableWidthAttrValue::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "VariableWidthAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - VariableWidthAttrValue::Render called
") );
pRegion->SetVariableWidth(this, Temp);
}
@@ -1507,8 +1499,6 @@
void VariableWidthAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "VariableWidthAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - VariableWidthAttrValue::Restore called
") );
pRegion->RestoreVariableWidth(this, Temp);
}
Index: Trunk/XaraLX/Kernel/npaper.cpp
===================================================================
--- Trunk/XaraLX/Kernel/npaper.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/npaper.cpp (revision 1361)
@@ -207,7 +207,6 @@
SubtreeRenderState NodeRenderablePaper::RenderSubtree(RenderRegion* pRender, Node** ppNextNode, BOOL bClip)
{
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
if (pRender && pRender->RenderPaperAsInk())
return SUBTREE_ROOTANDCHILDREN;
Index: Trunk/XaraLX/Kernel/brshattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/brshattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/brshattr.cpp (revision 1361)
@@ -2490,8 +2490,6 @@
if (pParent->IsATextChar())
{
- PORTNOTETRACE("text","BrushAttrValue::GetAttrBoundingRect - removed IsATextChar code");
-#ifndef EXCLUDE_FROM_XARALX
// text always has to be different doesn't it..
// create a format region to keep an attribute stack
@@ -2523,7 +2521,6 @@
m_CachedBRect = ReturnRect;
return ReturnRect;
-#endif
}
// Still nothing? Last resort time.
Index: Trunk/XaraLX/Kernel/appprefs.cpp
===================================================================
--- Trunk/XaraLX/Kernel/appprefs.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/appprefs.cpp (revision 1361)
@@ -124,7 +124,7 @@
#include "appprefs.h"
//#include "prefsdlg.h" // _R(IDD_APPLICATIONOPTIONS)
-//#include "prnprefs.h" // PrintingPrefs dialog box
+#include "prnprefs.h" // PrintingPrefs dialog box
#include "optsinet.h"
// The options tabs themselves
//#include "optsedit.h" // Edit tab handler
@@ -1245,9 +1245,8 @@
// Set up our special print options dialog box as well as this is effectively the
// same dialog box.
// WEBSTER-ranbirr-13/11/96
-#pragma message( __LOCMSG__ "Removed PrintPrefsDlg::Init usage" )
#ifndef WEBSTER
-// InitOK = InitOK && PrintPrefsDlg::Init();
+ InitOK = InitOK && PrintPrefsDlg::Init();
#endif //webster
Index: Trunk/XaraLX/Kernel/fontcomp.h
===================================================================
--- Trunk/XaraLX/Kernel/fontcomp.h (revision 1360)
+++ Trunk/XaraLX/Kernel/fontcomp.h (revision 1361)
@@ -173,7 +173,6 @@
String_64 mFullFontName;
String_64 mTypeFaceName;
FontClass mFontClass;
-//#pragma message( __LOCMSG__ "Removed CCPanose usage" )
CCPanose mPanoseNumber;
};
Index: Trunk/XaraLX/Kernel/offattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/offattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/offattr.cpp (revision 1361)
@@ -139,9 +139,6 @@
MILLIPOINT ConvertMeasurementToMillipointsAtCurrentViewScale(INT32 Width, UnitType type)
{
-//#pragma message( __LOCMSG__ "ConvertMeasurementToMillipointsAtCurrentViewScale - do nothing" )
-// TRACE( _T("Warning - ConvertMeasurementToMillipointsAtCurrentViewScale called
") );
-// return MILLIPOINT(0);
const double dpi = (double)GRenderRegion::GetDefaultDPI();
const double MillipointsPerPixel = (dpi <= 0) ? 750.0 : MILLIPOINTS_PER_INCH / dpi;
@@ -169,9 +166,6 @@
UINT32 ConvertMillipointsToPixelsAtCurrentViewScale(MILLIPOINT mp)
{
-//#pragma message( __LOCMSG__ "ConvertMillipointsToPixelsAtCurrentViewScale - do nothing" )
-// TRACE( _T("Warning - ConvertMillipointsToPixelsAtCurrentViewScale called
") );
-// return 0;
const double dpi = (double)GRenderRegion::GetDefaultDPI();
const double MillipointsPerPixel = (dpi <= 0) ? 750.0 : MILLIPOINTS_PER_INCH / dpi;
@@ -251,8 +245,6 @@
********************************************************************************************/
void OffscreenAttrValue::Render(RenderRegion *pRender, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "OffscreenAttrValue::Render - do nothing" )
-// TRACE( _T("Warning - OffscreenAttrValue::Render called
") );
// Debug test for an offscreen attribute being Render()'ed multiple times without
// OffscreenRenderingCompleted() being called. This is easily caused by:
// 1. rendering code which isn't bracketed by calls to SaveContext() / RestoreContext()
@@ -295,8 +287,6 @@
********************************************************************************************/
void OffscreenAttrValue::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "OffscreenAttrValue::Restore - do nothing" )
-// TRACE( _T("Warning - OffscreenAttrValue::Restore called
") );
pRegion->RestoreOffscreen(this);
}
Index: Trunk/XaraLX/Kernel/app.cpp
===================================================================
--- Trunk/XaraLX/Kernel/app.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/app.cpp (revision 1361)
@@ -480,7 +480,6 @@
#endif // VECTOR_STROKING
// Set up the Bitmap Cache...
-//#pragma message( __LOCMSG__ "Removed BitmapCache usage" )
TheBitmapCache = new CBitmapCache();
TheBitmapCache->Initialise(); // Initialise with default settings
@@ -800,7 +799,6 @@
m_pObjCache = NULL;
}
-//#pragma message( __LOCMSG__ "Remove BitmapCache usage" )
if (TheBitmapCache)
{
TheBitmapCache->DeInitialise();
@@ -929,9 +927,6 @@
***********************************************************************************************/
-//#pragma message( __LOCMSG__ "Removed RenderRegionList usage" )
-#if 1
-
RenderRegionList* Application::GetRegionList()
{
return &RenderList;
@@ -1010,7 +1005,6 @@
return TRUE;
}
-#endif
/********************************************************************************************
@@ -1029,8 +1023,6 @@
BOOL Application::ServiceRendering(BOOL bImmediate)
{
-//#pragma message( __LOCMSG__ "Application::ServiceRendering - do nothing" )
-// TRACE( wxT("Warning - Application::ServiceRendering called
") );
#ifdef RALPH
#ifdef _DEBUG
if(::GetCurrentThreadId() == RalphDocument::GetImportingThreadID())
Index: Trunk/XaraLX/Kernel/nodeshad.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeshad.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodeshad.cpp (revision 1361)
@@ -675,8 +675,6 @@
***********************************************************************************************/
void NodeShadow::Render(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "NodeShadow::Render - do nothing" )
-// TRACE( _T("Warning - NodeShadow::Render called
") );
m_bHaveTransformed = FALSE;
m_RenderBitmaps = FALSE;
@@ -1326,9 +1324,6 @@
**********************************************************************************************/
BOOL NodeShadow::RenderBitmapForDisplay(RenderRegion* pRegion, List* pList)
{
-//#pragma message( __LOCMSG__ "NodeShadow::RenderBitmapForDisplay - do nothing" )
-// TRACE( _T("Warning - NodeShadow::RenderBitmapForDisplay called
") );
-// return false;
// the shadow bitmap is cached, using the last scaled pixel width and quality settings.
MILLIPOINT CurrentPixWidth = pRegion->GetScaledPixelWidth();
enum Quality::Fill CurrentQuality = pRegion->RRQuality.GetFillQuality();
@@ -1481,9 +1476,6 @@
********************************************************************************************/
BOOL NodeShadow::RenderBitmapForDisplay()
{
-//#pragma message( __LOCMSG__ "NodeShadow::RenderBitmapForDisplay - do nothing" )
-// TRACE( _T("Warning - NodeShadow::RenderBitmapForDisplay called
") );
-// return false;
// Create a bitmap-shadower containing the shadow silhouette.
BitmapShadower* pBmpShadower = BitmapShadower::CreateSilhouetteBitmap((NodeShadowController*)GetParentController());
if (pBmpShadower == NULL)
@@ -2496,9 +2488,6 @@
********************************************************************************************/
BOOL NodeShadow::PostImport()
{
-//#pragma message( __LOCMSG__ "NodeShadow::PostImport - do nothing" )
-// TRACE( _T("Warning - NodeShadow::PostImport called
") );
-
NodeAttribute* pAttrTransp;
if (FindAppliedAttribute(CC_RUNTIME_CLASS(AttrTranspFillGeometry), &pAttrTransp) &&
!pAttrTransp->IsADefaultAttr())
@@ -3247,8 +3236,6 @@
********************************************************************************************/
BOOL NodeShadow::RenderShadow(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "NodeShadow::RenderShadow - do nothing" )
-// TRACE( _T("Warning - NodeShadow::RenderShadow called
") );
enum Quality::Fill CurrentQuality = pRender->RRQuality.GetFillQuality();
pRender->SaveContext();
@@ -3660,8 +3647,6 @@
BOOL BitmapShadower::CalculateBoundsAndScale2WithGRR()
{
-//#pragma message( __LOCMSG__ "BitmapShadower::CalculateBoundsAndScale2WithGRR - do nothing" )
-// TRACE( _T("Warning - BitmapShadower::CalculateBoundsAndScale2WithGRR called
") );
// leave a pixel-width's safety-margin around the bitmap.
// we don't use GetScaledPixelWidth(), as that is not always correct!
FIXED16 ScaleFactor;
@@ -3697,8 +3682,6 @@
BOOL BitmapShadower::CalculateBoundsAndScale2NoGRR()
{
-//#pragma message( __LOCMSG__ "BitmapShadower::CalculateBoundsAndScale2NoGRR - do nothing" )
-// TRACE( _T("Warning - BitmapShadower::CalculateBoundsAndScale2NoGRR called
") );
// we have no render region, but we need a render matrix,
// so we must get the view to construct a render matrix for us.
View* pView = View::GetCurrent();
@@ -3785,8 +3768,6 @@
********************************************************************************************/
BOOL BitmapShadower::CreateOffscreenRR()
{
-//#pragma message( __LOCMSG__ "BitmapShadower::CreateOffscreenRR - do nothing" )
-// TRACE( _T("Warning - BitmapShadower::CreateOffscreenRR called
") );
// create a concurrent renderer please, scaling it up if necessary.
// ConcurrentRenderer creates a new GRenderRegion, based on the given GRenderRegion.
m_pRendWrap = GRenderRegionWrapper::GetConcurrentRenderer( m_pGRR,
@@ -3856,9 +3837,7 @@
********************************************************************************************/
BOOL BitmapShadower::RenderShadowedNodeOffscreen()
{
-//#pragma message( __LOCMSG__ "BitmapShadower::RenderShadowedNodeOffscreen - do nothing" )
-// TRACE( _T("Warning - BitmapShadower::RenderShadowedNodeOffscreen called
") );
-// if we're rendering our shadowed nodes, then we need to pre-render all
+ // if we're rendering our shadowed nodes, then we need to pre-render all
// attributes which indirectly apply to it via the controller,
// *except* for offscreen attributes, as they're meant to divert rendering offscreen
// for our *controller* node, not us.
@@ -3988,8 +3967,6 @@
********************************************************************************************/
BOOL BitmapShadower::RenderShadowedNodeOffscreen()
{
-//#pragma message( __LOCMSG__ "BitmapShadower::RenderShadowedNodeOffscreen - do nothing" )
-// TRACE( _T("Warning - BitmapShadower::RenderShadowedNodeOffscreen called
") );
// if we're rendering our shadowed nodes, then we need to pre-render all
// attributes which indirectly apply to it via the controller,
// *except* for offscreen attributes, as they're meant to divert rendering offscreen
Index: Trunk/XaraLX/Kernel/nodeclip.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeclip.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodeclip.cpp (revision 1361)
@@ -322,7 +322,6 @@
// In the hit-test render-loop we do *not*
// want to directly cause any clipping. at all other times, we render away.
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
if (!pRender->IsHitDetect())
SetGDrawClippingRegion(pRender);
}
Index: Trunk/XaraLX/Kernel/csrstack.cpp
===================================================================
--- Trunk/XaraLX/Kernel/csrstack.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/csrstack.cpp (revision 1361)
@@ -114,7 +114,6 @@
// Own up in memory dumps
CC_IMPLEMENT_MEMDUMP(CursorStack, CC_CLASS_MEMDUMP)
-//#pragma message( __LOCMSG__ "CAM_DEBUG_NEW won't work" )
#define new CAM_DEBUG_NEW
Index: Trunk/XaraLX/Kernel/basedoc.h
===================================================================
--- Trunk/XaraLX/Kernel/basedoc.h (revision 1360)
+++ Trunk/XaraLX/Kernel/basedoc.h (revision 1361)
@@ -229,7 +229,6 @@
// Colour: Default colour context array, document IndexedColour list
protected:
-//#pragma message( __LOCMSG__ "DefaultColourContexts removed - We don't do any drawing yet" )
ColourContextArray DefaultColourContexts;
public:
Index: Trunk/XaraLX/Kernel/prnprefs.cpp
===================================================================
--- Trunk/XaraLX/Kernel/prnprefs.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/prnprefs.cpp (revision 1361)
@@ -488,7 +488,7 @@
OptionsTabs::GreyApplyNow();
// remove the apply now button as not required.
CDlgResID PageID = GetCurrentPageID(); // Get currently selected Tab id
- TalkToPage(NULL); // Select the main tab
+ TalkToPage(0); // Select the main tab
HideGadget(_R(ID_APPLY_NOW), TRUE); // hide button on main tab
TalkToPage(PageID); // Select the originally selected tab
@@ -555,6 +555,9 @@
OkUsed = FALSE; // Flag ok used
EndDialog = TRUE;
break;
+
+ default:
+ break;
}
}
@@ -566,6 +569,7 @@
// Operation and hence close the dialog box
if (!ok)
{
+ Msg->DlgMsg = DIM_NONE; // prevent baseclass from removing the dialog
EndDialog = FALSE; // Values not correct so do not allow exit
}
}
@@ -606,12 +610,14 @@
pOptionsTabs = OptionsTabs::GetNext(pOptionsTabs);
}
+ // Note this destroys "this". Hence don't call the base class
Close(); // Hide the dialog box
End(); // Finish the operation
// Make sure that we remove our options tabs link to the dialog box class
// as the dialog will now be destroyed
OptionsTabs::pPrefsDlg = NULL;
+ return Result;
}
// Check if have been sending an init/create message and if so then set flag False.
Index: Trunk/XaraLX/Kernel/paths.cpp
===================================================================
--- Trunk/XaraLX/Kernel/paths.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/paths.cpp (revision 1361)
@@ -1603,9 +1603,6 @@
#if !defined(EXCLUDE_FROM_XARLIB)
BOOL Path::GetTrueBoundingRect(DocRect* pRect, MILLIPOINT LineWidth, CCAttrMap* pAttrMap)
{
-//#pragma message( __LOCMSG__ "Path::GetTrueBoundingRect - do nothing" )
-// TRACE( _T("Warning - Path::GetTrueBoundingRect called
") );
-// return false;
// validate inputs.
if (pRect == NULL)
{
@@ -5619,8 +5616,6 @@
double Flatness,
BOOL Close)
{
-//#pragma message( __LOCMSG__ "Path::StrokePathToPath - do nothing" )
-// TRACE( _T("Warning - Path::StrokePathToPath called
") );
if (pDest == NULL) pDest = this;
UINT32 NewFlatness = (UINT32)Flatness;
@@ -5730,9 +5725,6 @@
//////////////////////////////////////////////////////////////////////////////////////
INT32 Path::GetContourForStep(Path* pDest, double StepValue)
{
-//#pragma message( __LOCMSG__ "Path::GetContourForStep - do nothing" )
-// TRACE( _T("Warning - Path::GetContourForStep called
") );
-// return 0;
// First Check to see if the Path pasted in is valid!
ERROR2IF(pDest==NULL,0,"Init GenPathContour Recieved a NULL Pointer!");
@@ -6761,8 +6753,6 @@
BOOL Path::FindNearestPoint(DocCoord pos, UINT32 flags, INT32* position)
{
#if !defined(EXCLUDE_FROM_XARLIB)
-//#pragma message( __LOCMSG__ "Path::FindNearestPoint - do nothing" )
-// TRACE( _T("Warning - Path::FindNearestPoint called
") );
// If neither ENDPOINTS or CONTROLPOINTS flags are set, return FALSE since the caller
// obviously doesn't want to look at anything!
if (!(flags & (POINTFLAG_ENDPOINTS | POINTFLAG_CONTROLPOINTS)))
Index: Trunk/XaraLX/Kernel/nodecomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecomp.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodecomp.cpp (revision 1361)
@@ -270,9 +270,6 @@
**********************************************************************************************/
ChangeCode NodeCompound::OnChildChange(ObjChangeParam* pParam)
{
-//#pragma message( __LOCMSG__ "NodeCompound::OnChildChange - do nothing" )
-// TRACE( _T("Warning - NodeCompound::OnChildChange called
") );
-// return CC_FAIL;
if (IsNodeHidden())
return CC_OK;
@@ -315,7 +312,7 @@
DocRect Bounds = BoundingRectangle;
BlobManager* BlobMgr = GetApplication()->GetBlobManager();
-// INT32 BlobSize = 0;
+ INT32 BlobSize = 0;
if (!pOp && pParam->GetChangeType() == OBJCHANGE_FINISHED &&
pParam->GetDirection() == OBJCHANGE_CALLEDBYCHILD &&
@@ -327,7 +324,7 @@
if (BlobMgr)
{
- BlobMgr->GetBlobSize();
+ BlobSize = BlobMgr->GetBlobSize();
}
if (pParam->GetChangeType() == OBJCHANGE_STARTING)
@@ -389,10 +386,7 @@
{
if (pItem->pNode)
{
-PORTNOTE("text","Removed PrePostTextAction::DoFormatStory usage")
-#ifndef EXCLUDE_FROM_XARALX
PrePostTextAction::DoFormatStory(pOp, (TextStory *) pItem->pNode, TRUE);
-#endif
}
pItem = (NodeListItem *)TextNodeList.GetNext(pItem);
@@ -477,8 +471,6 @@
{
bRegen = FALSE;
}
-PORTNOTE("text","Removed OpTextFormat usage")
-#ifndef EXCLUDE_FROM_XARALX
else if (pOp->IsKindOf(CC_RUNTIME_CLASS(OpTextFormat)))
{
// indicates a change in the text (e.g. the user has typed in)
@@ -504,9 +496,6 @@
bCache = TRUE;
}
-#endif
-PORTNOTE("text","Removed OpDeleteTextStory usage")
-#ifndef EXCLUDE_FROM_XARALX
else if (pOp->IsKindOf(CC_RUNTIME_CLASS(OpDeleteTextStory)))
{
// indicates that a text story has been deleted - so if my inside
@@ -518,7 +507,6 @@
bRegen = FALSE;
}
}
-#endif
else
{
// regen for all other ops
@@ -1563,10 +1551,7 @@
Flags.TransformNode ||
Flags.RegenerateNode ||
( pChangeOp != NULL
-PORTNOTE("text","Removed OpTextUndoable usage")
-#ifndef EXCLUDE_FROM_XARALX
&& pChangeOp->IS_KIND_OF( OpTextUndoable )
-#endif
) )
{
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am (revision 1360)
+++ Trunk/XaraLX/Kernel/Makefile.am (revision 1361)
@@ -77,7 +77,7 @@
swfbuttn.cpp swffont.cpp swfplace.cpp swfrndr.cpp swfshape.cpp swfsprit.cpp \
swfexpdc.cpp swftext.cpp pmaskrgn.cpp printctl.cpp prnmkcom.cpp prnmks.cpp \
xsepsops.cpp xarprefs.cpp printing.cpp prntview.cpp psrndrgn.cpp opimgset.cpp \
- optsprin.cpp
+ optsprin.cpp prnprefs.cpp
AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/nodecntr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecntr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodecntr.cpp (revision 1361)
@@ -1983,8 +1983,6 @@
***********************************************************************************************/
void NodeContour::RenderTinyBlobs(RenderRegion * pRender)
{
-//#pragma message( __LOCMSG__ "NodeContour::RenderEorDrag - do nothing" )
-// TRACE( _T("Warning - NodeContour::RenderEorDrag called
") );
// Set the line colours etc as we need them
pRender->SaveContext();
pRender->SetLineColour(COLOUR_NONE);
Index: Trunk/XaraLX/Kernel/toollist.cpp
===================================================================
--- Trunk/XaraLX/Kernel/toollist.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/toollist.cpp (revision 1361)
@@ -218,9 +218,6 @@
ToolListItem *ToolList::Add(Tool *NewTool, UINT32 ParentID)
{
-//#pragma message( __LOCMSG__ "ToolList::Add - do nothing" )
-// TRACE( _T("Warning - ToolList::Add called
") );
-// return NULL;
// Construct a tentative list item
ToolListItem *NewItem = new ToolListItem(NewTool, ParentID);
if (NewItem == NULL)
Index: Trunk/XaraLX/Kernel/layer.cpp
===================================================================
--- Trunk/XaraLX/Kernel/layer.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/layer.cpp (revision 1361)
@@ -3125,8 +3125,6 @@
void Layer::SetGuideColour(IndexedColour* pIndexedColour)
{
-//#pragma message( __LOCMSG__ "Layer::SetGuideColour - do nothing" )
-// TRACE( _T("Warning - Layer::SetGuideColour called
") );
if (pGuideColour == NULL)
pGuideColour = new DocColour();
@@ -3137,7 +3135,6 @@
ColourValue r = ColourValue(double(GuideLayerRed) / double(COL_MAX));
ColourValue g = ColourValue(double(GuideLayerGreen) / double(COL_MAX));
ColourValue b = ColourValue(double(GuideLayerBlue) / double(COL_MAX));
-//#pragma message( __LOCMSG__ "Removed IndexedColour usage" )
pIndexedColour = new IndexedColour(r,g,b);
pIndexedGuideColour = pIndexedColour;
}
Index: Trunk/XaraLX/Kernel/nodershp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodershp.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodershp.cpp (revision 1361)
@@ -717,8 +717,6 @@
********************************************************************************************/
void NodeRegularShape::Render ( RenderRegion* pRender )
{
-//#pragma message( __LOCMSG__ "NodeRegularShape::Render - do nothing" )
-// TRACE( _T("Warning - NodeRegularShape::Render called
") );
Path* pRenderPath = NULL;
// Attempt to build a shape path.
@@ -744,8 +742,6 @@
********************************************************************************************/
void NodeRegularShape::RenderEorDrag( RenderRegion* pRender )
{
-//#pragma message( __LOCMSG__ "NodeRegularShape::RenderEorDrag - do nothing" )
-// TRACE( _T("Warning - NodeRegularShape::RenderEorDrag called
") );
Path* RenderPath = NULL;
if (BuildShapePath(&RenderPath))
Index: Trunk/XaraLX/Kernel/spread.cpp
===================================================================
--- Trunk/XaraLX/Kernel/spread.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/spread.cpp (revision 1361)
@@ -444,8 +444,6 @@
void Spread::RenderPasteboard( RenderRegion* pRender )
{
-//#pragma message( __LOCMSG__ "Spread::RenderPasteboard- do nothing" )
-// TRACE( _T("Warning - Spread::RenderPasteboard called
") );
// Ensure we don't dither the filled areas
pRender->SetSolidColours(TRUE);
@@ -583,8 +581,6 @@
void Spread::RenderDropShadows(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "Spread::RenderDropShadows- do nothing" )
-// TRACE( _T("Warning - Spread::RenderDropShadows called
") );
// If we have the new page background layer present then we needn't bother redrawing the
// page as we might get a flash of white as we redraw
// Therefore, we don't need to add a pixel on the right hand side page border
@@ -744,8 +740,6 @@
void Spread::RenderBleedArea( RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "Spread::RenderBleedArea - do nothing" )
-// TRACE( _T("Warning - Spread::RenderBleedArea called
") );
if (BleedOffset != 0)
{
// Draw a rectangle BleedOffset outside the common bounding rectangle of all pages
Index: Trunk/XaraLX/Kernel/clipattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/clipattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/clipattr.cpp (revision 1361)
@@ -181,8 +181,6 @@
// (DWORD)m_pClipPath);
// TRACEUSER( "Karim", _T("pClipAttr 0x%x Render()'ed by RR 0x%x
"),
// (DWORD)this, (DWORD)pRender);
-//#pragma message( __LOCMSG__ "ClipRegionAttribute::Render - do nothing" )
-// TRACE( _T("Warning - ClipRegionAttribute::Render called
") );
pRender->SetClipRegion(this, Temp);
}
@@ -209,8 +207,6 @@
// (DWORD)m_pClipPath);
// TRACEUSER( "Karim", _T("pClipAttr 0x%x Restore()'ed by RR 0x%x
"),
// (DWORD)this, (DWORD)pRender);
-//#pragma message( __LOCMSG__ "ClipRegionAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - ClipRegionAttribute::Restore called
") );
pRender->RestoreClipRegion(this, Temp);
}
@@ -360,8 +356,6 @@
void AttrClipView::Render( RenderRegion* pRender )
{
-//#pragma message( __LOCMSG__ "ClipRegionAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - ClipRegionAttribute::Restore called
") );
// check the pointer and also make sure that we`re allowed to render
if (!pRender || !m_DoRender)
return;
Index: Trunk/XaraLX/Kernel/bmpcomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpcomp.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/bmpcomp.cpp (revision 1361)
@@ -1287,9 +1287,6 @@
CXaraFile * pCXFile,
INT32 Tag, UINT32 Size, UINT32 RecordNumber)
{
-//#pragma message( __LOCMSG__ "BitmapListComponent::LoadBitmapDefinition - do nothing" )
-// TRACE( _T("Warning - BitmapListComponent::LoadBitmapDefinition called
") );
-// return false;
ERROR2IF(pXFileRecHandler == NULL,FALSE,"BitmapListComponent::LoadBitmapDefinition NULL pXFileRecHandler");
ERROR2IF(pCXFile == NULL,FALSE,"BitmapListComponent::LoadBitmapDefinition NULL pCXFile");
ERROR2IF(pImportedBitmaps == NULL,FALSE,"BitmapListComponent::LoadBitmapDefinition NULL pImportedBitmaps");
Index: Trunk/XaraLX/Kernel/ndmldgrp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ndmldgrp.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/ndmldgrp.cpp (revision 1361)
@@ -555,8 +555,6 @@
SubtreeRenderState NodeMouldGroup::RenderSubtree(RenderRegion* pRender, Node** ppNextNode, BOOL bClip)
{
-//#pragma message( __LOCMSG__ "NodeMouldGroup::RenderSubtree - do nothing" )
-// TRACE( _T("Warning - NodeMouldGroup::RenderSubtree called
") );
if (pRender && pRender->RenderPaperAsInk())
return SUBTREE_ROOTANDCHILDREN;
Index: Trunk/XaraLX/Kernel/pbecomea.cpp
===================================================================
--- Trunk/XaraLX/Kernel/pbecomea.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/pbecomea.cpp (revision 1361)
@@ -373,9 +373,6 @@
********************************************************************************************/
Path* PathBecomeA::ExtractOutlineAsPath(NodePath* pSrcNodePath, CCAttrMap* pAttrMap)
{
-//#pragma message( __LOCMSG__ "PathBecomeA::ExtractOutlineAsPath - do nothing" )
-// TRACE( _T("Warning - PathBecomeA::ExtractOutlineAsPath called
") );
-// return NULL;
// we can accept NULL inputs - we just don't do any processing for them.
if (pAttrMap == NULL || pSrcNodePath == NULL)
return NULL;
Index: Trunk/XaraLX/Kernel/nodemold.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodemold.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodemold.cpp (revision 1361)
@@ -852,8 +852,6 @@
BOOL NodeMould::DoBecomeA(BecomeA* pBecomeA)
{
-//#pragma message( __LOCMSG__ "NodeMould::DoBecomeA - do nothing" )
-// TRACE( _T("Warning - NodeMould::DoBecomeA called
") );
BOOL ok;
switch (pBecomeA->GetReason())
@@ -1571,9 +1569,6 @@
NodeMoulder* NodeMould::CreateNewMoulder(UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::CreateNewMoulder - do nothing" )
-// TRACE( _T("Warning - NodeMould::CreateNewMoulder called
") );
-// return NULL;
BOOL ok;
// first find the mould group
@@ -1622,9 +1617,6 @@
AttachNodeDirection Direction,
UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::AddNewMoulder - do nothing" )
-// TRACE( _T("Warning - NodeMould::AddNewMoulder called
") );
-// return NULL;
BOOL ok;
// create a new moulder object
@@ -1682,9 +1674,6 @@
DocRect* const pDestin,
UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::CreateNewMouldShape - do nothing" )
-// TRACE( _T("Warning - NodeMould::CreateNewMouldShape called
") );
-// return NULL;
ERROR2IF(pShape==NULL, NULL, "NodeMould::CreateNewMouldShape() called with a null path");
// Note, we do not record the mouldspace in our class because
@@ -1821,9 +1810,6 @@
NodeMouldGroup* NodeMould::CreateNewMouldGroup(UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::CreateNewMouldGroup - do nothing" )
-// TRACE( _T("Warning - NodeMould::CreateNewMouldGroup called
") );
-// return NULL;
// Create a mould group object
NodeMouldGroup* pMouldGroup;
ALLOC_WITH_FAIL( pMouldGroup, new NodeMouldGroup, pOp);
@@ -1849,9 +1835,6 @@
NodeMouldGroup* NodeMould::AddNewMouldGroup(UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::AddNewMouldGroup - do nothing" )
-// TRACE( _T("Warning - NodeMould::AddNewMouldGroup called
") );
-// return NULL;
BOOL ok;
// Create a mould group object
@@ -1907,9 +1890,6 @@
List* NodeList,
UndoableOperation* pOp)
{
-//#pragma message( __LOCMSG__ "NodeMould::FillMouldGroup - do nothing" )
-// TRACE( _T("Warning - NodeMould::FillMouldGroup called
") );
-// return false;
BOOL ok;
Node* pObj;
@@ -2644,9 +2624,6 @@
BOOL NodeMould::PostImport()
{
-//#pragma message( __LOCMSG__ "NodeMould::PostImport - do nothing" )
-// TRACE( _T("Warning - NodeMould::PostImport called
") );
-
// if theres already some moulded objects then fine....
if (CountMoulders()>0)
return TRUE;
Index: Trunk/XaraLX/Kernel/quality.cpp
===================================================================
--- Trunk/XaraLX/Kernel/quality.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/quality.cpp (revision 1361)
@@ -348,8 +348,6 @@
void QualityAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "QualityAttribute::Render - do nothing" )
-// TRACE( _T("Warning - QualityAttribute::Render called
") );
pRegion->SetQuality(this, Temp);
}
@@ -371,8 +369,6 @@
void QualityAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "QualityAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - QualityAttribute::Restore called
") );
pRegion->RestoreQuality(this, Temp);
}
@@ -523,8 +519,6 @@
void AttrQuality::Render( RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "AttrQuality::Render - do nothing" )
-// TRACE( _T("Warning - AttrQuality::Render called
") );
pRender->SetQuality(&Value, FALSE);
Layer* pLayer = (Layer*)FindParent(CC_RUNTIME_CLASS(Layer));
Index: Trunk/XaraLX/Kernel/nodebmp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodebmp.cpp (revision 1361)
@@ -574,8 +574,6 @@
void NodeBitmap::Render(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "NodeBitmap::Render - do nothing" )
-// TRACE( _T("Warning - NodeBitmap::Render called
") );
// No need to render if we are going to supply directly to a capture
Capture* pCapture = pRender->GetTopCapture();
if (!(pCapture && pCapture->ConsumeDirectBitmap(this)))
Index: Trunk/XaraLX/Kernel/rndrgn.h
===================================================================
--- Trunk/XaraLX/Kernel/rndrgn.h (revision 1360)
+++ Trunk/XaraLX/Kernel/rndrgn.h (revision 1361)
@@ -301,7 +301,6 @@
********************************************************************************************/
-//#pragma message( __LOCMSG__ "SubRenderContext removed" )
class SubRenderContext : public CCObject
{
CC_DECLARE_DYNAMIC(SubRenderContext);
@@ -325,7 +324,6 @@
********************************************************************************************/
-//#pragma message( __LOCMSG__ "SubTreeRenderContext removed" )
class SubTreeRenderContext : public SubRenderContext
{
CC_DECLARE_DYNAMIC(SubTreeRenderContext);
@@ -369,7 +367,6 @@
CC_DECLARE_DYNAMIC( RenderRegion )
-//#pragma message( __LOCMSG__ "RenderRegion stripped" )
public:
// Render Region Creation and Destruction
RenderRegion();
Index: Trunk/XaraLX/Kernel/nodecont.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodecont.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodecont.cpp (revision 1361)
@@ -4038,8 +4038,6 @@
BOOL NodeShadowController::FindCachedEffect(CBitmapCache* pBitmapCache)
{
-//#pragma message( __LOCMSG__ "Removed CBitmapCache usage" )
-// return false;
CBitmapCacheKey inky(this, GetPixelWidth(), 0); // Get cached BMP for this ORIGINAL node at our dpi
CCachedBitmap cbmp;
BOOL bFoundCached = pBitmapCache->Lookup(inky, cbmp);
Index: Trunk/XaraLX/Kernel/ops.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ops.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/ops.cpp (revision 1361)
@@ -1120,7 +1120,6 @@
if (pDocView)
{
pDocView->FlushRedraw();
-//#pragma message( __LOCMSG__ "Removed RenderRegionList usage" )
GetApplication()->ServiceRendering(TRUE);
}
}
Index: Trunk/XaraLX/Kernel/txtattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/txtattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/txtattr.cpp (revision 1361)
@@ -259,8 +259,6 @@
void TxtFontTypefaceAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtFontTypefaceAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtFontTypefaceAttribute::Restore called
") );
pRegion->SetTxtFontTypeface(this, Temp);
}
@@ -280,8 +278,6 @@
void TxtFontTypefaceAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtFontTypefaceAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtFontTypefaceAttribute::Restore called
") );
pRegion->RestoreTxtFontTypeface(this, Temp);
}
@@ -485,8 +481,6 @@
void TxtFontSizeAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtFontSizeAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtFontSizeAttribute::Restore called
") );
pRegion->SetTxtFontSize(this, Temp);
}
@@ -506,8 +500,6 @@
void TxtFontSizeAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtFontSizeAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtFontSizeAttribute::Restore called
") );
pRegion->RestoreTxtFontSize(this, Temp);
}
@@ -707,8 +699,6 @@
void TxtBoldAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtBoldAttribute::Render - do nothing" )
-// TRACE( _T("Warning - TxtBoldAttribute::Render called
") );
pRegion->SetTxtBold(this, Temp);
}
@@ -728,8 +718,6 @@
void TxtBoldAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtBoldAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtBoldAttribute::Restore called
") );
pRegion->RestoreTxtBold(this, Temp);
}
@@ -928,8 +916,6 @@
void TxtItalicAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtItalicAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtItalicAttribute::Restore called
") );
pRegion->SetTxtItalic(this, Temp);
}
@@ -949,8 +935,6 @@
void TxtItalicAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtItalicAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtItalicAttribute::Restore called
") );
pRegion->RestoreTxtItalic(this, Temp);
}
@@ -1149,8 +1133,6 @@
void TxtUnderlineAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtUnderlineAttribute::Render - do nothing" )
-// TRACE( _T("Warning - TxtUnderlineAttribute::Render called
") );
pRegion->SetTxtUnderline(this, Temp);
}
@@ -1170,8 +1152,6 @@
void TxtUnderlineAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtUnderlineAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtUnderlineAttribute::Restore called
") );
pRegion->RestoreTxtUnderline(this, Temp);
}
@@ -1364,8 +1344,6 @@
void TxtAspectRatioAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtAspectRatioAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtAspectRatioAttribute::Restore called
") );
pRegion->SetTxtAspectRatio(this, Temp);
}
@@ -1385,8 +1363,6 @@
void TxtAspectRatioAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtAspectRatioAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtAspectRatioAttribute::Restore called
") );
pRegion->RestoreTxtAspectRatio(this, Temp);
}
@@ -1590,8 +1566,6 @@
void TxtJustificationAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtJustificationAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtJustificationAttribute::Restore called
") );
pRegion->SetTxtJustification(this, Temp);
}
@@ -1611,8 +1585,6 @@
void TxtJustificationAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtJustificationAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtJustificationAttribute::Restore called
") );
pRegion->RestoreTxtJustification(this, Temp);
}
@@ -1814,8 +1786,6 @@
void TxtTrackingAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtTrackingAttribute::Render - do nothing" )
-// TRACE( _T("Warning - TxtTrackingAttribute::Render called
") );
pRegion->SetTxtTracking(this, Temp);
}
@@ -1835,8 +1805,6 @@
void TxtTrackingAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtTrackingAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtTrackingAttribute::Restore called
") );
pRegion->RestoreTxtTracking(this, Temp);
}
@@ -2039,8 +2007,6 @@
void TxtScriptAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtScriptAttribute::Render - do nothing" )
-// TRACE( _T("Warning - TxtScriptAttribute::Render called
") );
pRegion->SetTxtScript(this, Temp);
}
@@ -2060,8 +2026,6 @@
void TxtScriptAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtScriptAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtScriptAttribute::Restore called
") );
pRegion->RestoreTxtScript(this, Temp);
}
@@ -2261,8 +2225,6 @@
void TxtBaseLineAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtBaseLineAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtBaseLineAttribute::Restore called
") );
pRegion->SetTxtBaseLine(this, Temp);
}
@@ -2282,8 +2244,6 @@
void TxtBaseLineAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtBaseLineAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtBaseLineAttribute::Restore called
") );
pRegion->RestoreTxtBaseLine(this, Temp);
}
@@ -2530,8 +2490,6 @@
void TxtLineSpaceAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtLineSpaceAttribute::Render - do nothing" )
-// TRACE( _T("Warning - TxtLineSpaceAttribute::Render called
") );
pRegion->SetTxtLineSpace(this, Temp);
}
@@ -2551,8 +2509,6 @@
void TxtLineSpaceAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "TxtLineSpaceAttribute::Restore - do nothing" )
-// TRACE( _T("Warning - TxtLineSpaceAttribute::Restore called
") );
pRegion->RestoreTxtLineSpace(this, Temp);
}
@@ -2783,8 +2739,6 @@
void AttrTxtFontTypeface::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtFontTypeface::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtFontTypeface::Render called
") );
pRegion->SetTxtFontTypeface(&Value, FALSE);
}
@@ -3101,8 +3055,6 @@
void AttrTxtBold::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtBold::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtBold::Render called
") );
pRegion->SetTxtBold(&Value, FALSE);
}
@@ -3388,8 +3340,6 @@
void AttrTxtItalic::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtItalic::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtItalic::Render called
") );
pRegion->SetTxtItalic(&Value, FALSE);
}
@@ -3676,8 +3626,6 @@
void AttrTxtFontSize::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtFontSize::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtFontSize::Render called
") );
pRegion->SetTxtFontSize(&Value, FALSE);
}
@@ -3977,8 +3925,6 @@
void AttrTxtUnderline::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtUnderline::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtUnderline::Render called
") );
pRegion->SetTxtUnderline(&Value, FALSE);
}
@@ -4247,8 +4193,6 @@
void AttrTxtAspectRatio::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtAspectRatio::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtAspectRatio::Render called
") );
pRegion->SetTxtAspectRatio(&Value, FALSE);
}
@@ -4542,8 +4486,6 @@
void AttrTxtJustification::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtJustification::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtJustification::Render called
") );
pRegion->SetTxtJustification(&Value, FALSE);
}
@@ -4849,8 +4791,6 @@
void AttrTxtTracking::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtTracking::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtTracking::Render called
") );
pRegion->SetTxtTracking(&Value, FALSE);
}
@@ -5134,8 +5074,6 @@
void AttrTxtScript::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtScript::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtScript::Render called
") );
pRegion->SetTxtScript(&Value, FALSE);
}
@@ -5421,8 +5359,6 @@
void AttrTxtBaseLine::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtBaseLine::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtBaseLine::Render called
") );
pRegion->SetTxtBaseLine(&Value, FALSE);
}
@@ -5770,8 +5706,6 @@
void AttrTxtLineSpace::Render( RenderRegion* pRegion)
{
-//#pragma message( __LOCMSG__ "AttrTxtLineSpace::Render - do nothing" )
-// TRACE( _T("Warning - AttrTxtLineSpace::Render called
") );
pRegion->SetTxtLineSpace(&Value, FALSE);
}
Index: Trunk/XaraLX/Kernel/app.h
===================================================================
--- Trunk/XaraLX/Kernel/app.h (revision 1360)
+++ Trunk/XaraLX/Kernel/app.h (revision 1361)
@@ -242,7 +242,6 @@
BOOL CreateDragTargets(DragInformation * DragInfo);
-//#pragma message( __LOCMSG__ "Removed RenderRegionList usage" )
void AddRenderRegion(RenderRegion *);
BOOL DeleteRenderRegion(RenderRegion *);
void DeleteRenderRegions(Document *pDoc)
@@ -370,7 +369,6 @@
private:
-//#pragma message( __LOCMSG__ "Removed RenderRegionList usage" )
RenderRegionList RenderList;
BOOL ImmediateRenderPending;
Index: Trunk/XaraLX/Kernel/webattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/webattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/webattr.cpp (revision 1361)
@@ -307,7 +307,6 @@
Value.SetClickableRectangleInRendering(GetClickableRectangle());
//Then set our WebAddressAttribute member variable into that render region
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
pRender->SetWebAddress(&Value, FALSE);
}
@@ -927,7 +926,6 @@
void WebAddressAttribute::Render(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
pRegion->SetWebAddress(this, Temp);
}
@@ -944,7 +942,6 @@
void WebAddressAttribute::Restore(RenderRegion *pRegion, BOOL Temp)
{
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
pRegion->RestoreWebAddress(this, Temp);
}
Index: Trunk/XaraLX/Kernel/grid.cpp
===================================================================
--- Trunk/XaraLX/Kernel/grid.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/grid.cpp (revision 1361)
@@ -366,9 +366,6 @@
SubtreeRenderState NodeGrid::RenderSubtree(RenderRegion *pRender, Node** ppNextNode, BOOL bClip)
{
-//#pragma message( __LOCMSG__ "NodeGrid::RenderSubtree - do nothing" )
-// TRACE( _T("Warning - NodeGrid::RenderSubtree called
") );
-// return SUBTREE_ROOTANDCHILDREN;
// If no cliprect supplied, assume we do need to render
if (pRender==NULL || !bClip)
return SUBTREE_ROOTANDCHILDREN;
@@ -626,9 +623,6 @@
DocRect NodeGrid::GetBlobBoundingRect()
{
-//#pragma message( __LOCMSG__ "NodeGrid::GetBlobBoundingRect - do nothing" )
-// TRACE( _T("Warning - NodeGrid::GetBlobBoundingRect called
") );
-// return DocRect();
// Find the paths bounding rectangle
DocRect Rect = GridBoundingRect;
Index: Trunk/XaraLX/Kernel/fthrattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/fthrattr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/fthrattr.cpp (revision 1361)
@@ -541,8 +541,6 @@
********************************************************************************************/
void FeatherAttrValue::OffscreenRenderingCompleted(RenderRegion *pRender, LPBITMAPINFO lpBitmapInfo, LPBYTE lpBits, DocRect BitmapRect)
{
-//#pragma message( __LOCMSG__ "FeatherAttrValue::OffscreenRenderingCompleted - do nothing" )
-// TRACE( _T("Warning - FeatherAttrValue::OffscreenRenderingCompleted called
") );
// TRACEUSER( "Gerry", _T("Feather attribute OffscreenRenderingCompleted (0x%08x)
"), this);
// TRACEUSER( "Phil", _T("Feather attribute OffscreenRenderingCompleted (0x%08x)
"), this);
@@ -803,8 +801,6 @@
if (DoesOffscreenBMPCaptureBackground())
return FALSE;
-//#pragma message( __LOCMSG__ "Removed GRenderRegion usage" )
-// return false;
if (pGRR == NULL)
{
ERROR3("FeatherAttrValue::DoesOffscreenBmpRequireTransp; Invalid params!");
@@ -948,10 +944,6 @@
LPBYTE* ppBmpBits,
Path* pOutline)
{
-//#pragma message( __LOCMSG__ "FeatherAttrValue::CreateSilhouetteBitmap - do nothing" )
-// TRACE( _T("Warning - FeatherAttrValue::CreateSilhouetteBitmap called
") );
-// return NULL;
-
// ERROR3IF(m_pOffscreenBmpInfo == NULL,
// "FeatherAttrValue::CreateSilhouetteBitmap; No offscreen bitmap info.");
Index: Trunk/XaraLX/Kernel/nodetext.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodetext.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodetext.cpp (revision 1361)
@@ -1745,7 +1745,6 @@
BOOL AbstractTextChar::ReCacheMetrics(FormatRegion* pFormatRegion)
{
- PORTNOTE("text","AbstractTextChar::ReCacheMetrics - do nothing");
#ifndef DISABLE_TEXT_RENDERING
// get metrics for this char with current attribute stack
CharMetrics metrics;
@@ -2005,7 +2004,6 @@
BOOL TextChar::RenderCore(RenderRegion* pRenderRegion)
{
- PORTNOTE("text","TextChar::RenderCore - do nothing");
#ifndef DISABLE_TEXT_RENDERING
ERROR2IF(pRenderRegion == NULL, FALSE, "TextChar::RenderCore() - pRenderRegion == NULL");
@@ -2200,7 +2198,6 @@
BOOL TextChar::CreateNodePath(NodePath** ppNodePath, FormatRegion* pFormatRegion)
{
- PORTNOTE("text","TextChar::CreateNodePath - do nothing");
#ifndef DISABLE_TEXT_RENDERING
ERROR2IF(pFormatRegion==NULL,FALSE,"TextChar::CreateNodePath() - pFormatRegion==NULL");
ERROR2IF( ppNodePath==NULL,FALSE,"TextChar::CreateNodePath() - ppNodePath==NULL");
Index: Trunk/XaraLX/Kernel/attrmgr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/attrmgr.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/attrmgr.cpp (revision 1361)
@@ -238,8 +238,6 @@
UINT32 NameResID,
DocColour *Result)
{
-//#pragma message( __LOCMSG__ "AttributeManager::FindDefaultColour- do nothing" )
-// TRACE( wxT("Warning - AttributeManager::FindDefaultColour called
") );
ERROR3IF(Result == NULL, "AttrMgr: FindDefaultColour - NULL Result param is illegal");
if (Result == NULL)
return;
@@ -1601,8 +1599,6 @@
static BOOL UpdateDeletedColour(ColourList *ColList, DocColour *TheColour,
IndexedColour **NewDefault)
{
-//#pragma message( __LOCMSG__ "UpdateDeletedColour - do nothing" )
-// TRACE( wxT("Warning - UpdateDeletedColour called
") );
if (TheColour == NULL) // No colour to fix!
return FALSE;
Index: Trunk/XaraLX/Kernel/document.cpp
===================================================================
--- Trunk/XaraLX/Kernel/document.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/document.cpp (revision 1361)
@@ -247,7 +247,6 @@
BleedOffset = DefBleedSize;
// Set up our array of default colour contexts by copying the 'global' array
-//#pragma message( __LOCMSG__ "DefaultColourContexts remove - no drawing yet" )
ColourContext::GetGlobalDefaults( &DefaultColourContexts );
// Add this document to the list of all documents in Camelot
Index: Trunk/XaraLX/Kernel/ndclpcnt.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ndclpcnt.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/ndclpcnt.cpp (revision 1361)
@@ -512,8 +512,6 @@
********************************************************************************************/
SubtreeRenderState NodeClipViewController::RenderSubtree(RenderRegion* pRender, Node** ppNextNode, BOOL bClip)
{
-//#pragma message( __LOCMSG__ "NodeClipViewController::RenderSubtree - do nothing" )
-// TRACE( _T("Warning - NodeClipViewController::RenderSubtree called
") );
if (pRender && !pRender->IsPrinting())
{
// ensure our cached keyhole path is up to date.
@@ -1629,7 +1627,6 @@
{
DocColour* pLineColour = ((AttrStrokeColour*)pAppliedAttr)->GetStartColour();
if (pLineColour != NULL)
-//#pragma message( __LOCMSG__ "Removed DocColour usage" )
return pLineColour->IsTransparent();
}
return FALSE;
Index: Trunk/XaraLX/Kernel/nodeshap.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nodeshap.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/nodeshap.cpp (revision 1361)
@@ -465,7 +465,6 @@
void NodeSimpleShape::Render(RenderRegion* pRender)
{
// render the path
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
pRender->DrawPath(&InkPath);
}
@@ -487,7 +486,6 @@
{
// Render an EORed version of the shape. For a simple object such
// as this we can render it as normal
-//#pragma message( __LOCMSG__ "Removed RenderRegion usage" )
pRender->DrawPath(&InkPath);
}
Index: Trunk/XaraLX/Kernel/node.cpp
===================================================================
--- Trunk/XaraLX/Kernel/node.cpp (revision 1360)
+++ Trunk/XaraLX/Kernel/node.cpp (revision 1361)
@@ -372,8 +372,6 @@
********************************************************************************************/
void Node::RenderTreeAtomic(RenderRegion* pRender)
{
-//#pragma message( __LOCMSG__ "Node::RenderTreeAtomic - do nothing" )
-// TRACE( _T("Warning - Node::RenderTreeAtomic called
") );
ERROR3IF(pRender == NULL, "Node::RenderTreeAtomic; NULL pRender parameter not allowed!");
pRender->RenderTree(this, FALSE);
@@ -3942,8 +3940,6 @@
Node *Node::FindChildToRender(DocRect *const pClipRect, RenderRegion *const pRender, BOOL ExcludeLockedLayers,
Node* pStopNode)
{
-//#pragma message( __LOCMSG__ "Node::FindChildToRender - do nothing" )
-// TRACE( _T("Warning - Node::FindChildToRender called
") );
ENSURE(this != NULL, "FindChildToRender called on NULL pointer");
Node *pNode = this;
@@ -4033,8 +4029,6 @@
BOOL ExcludeLockedLayers,
Node* pStopNode)
{
-//#pragma message( __LOCMSG__ "Node::FindNextForClippedInkRender - do nothing" )
-// TRACE( _T("Warning - Node::FindNextForClippedInkRender called
") );
ENSURE(pRender != NULL, "Render region NULL in FindNextForClippedInkRender");
Node* pNode = this;
BOOL IsSpread = pNode->IsSpread();
@@ -4157,8 +4151,6 @@
Node *Node::FindChildToRenderUnclipped(RenderRegion *const pRender)
{
-//#pragma message( __LOCMSG__ "Node::FindChildToRenderUnclipped - do nothing" )
-// TRACE( _T("Warning - Node::FindChildToRenderUnclipped called
") );
ENSURE(this != NULL, "FindChildToRenderUnclipped called on NULL pointer");
Node *pNode = this;
@@ -4244,8 +4236,6 @@
Node* Node::FindNextForUnclippedInkRender(RenderRegion *pRender)
{
-//#pragma message( __LOCMSG__ "Node::FindNextForUnclippedInkRender - do nothing" )
-// TRACE( _T("Warning - Node::FindNextForUnclippedInkRender called
") );
ENSURE(pRender != NULL, "Render region NULL in FindNextForUnclippedInkRender");
Node* pNode = this;
Index: Trunk/XaraLX/wxOil/grndrgn.h
===================================================================
--- Trunk/XaraLX/wxOil/grndrgn.h (revision 1360)
+++ Trunk/XaraLX/wxOil/grndrgn.h (revision 1361)
@@ -168,7 +168,6 @@
GRenderRegion(DocRect ClipRegion, Matrix ConvertMatrix, FIXED16 ViewScale, UINT32 Depth, double dpi);
virtual ~GRenderRegion();
-//#pragma message( __LOCMSG__ "GRenderRegion is stripped" )
static BOOL Init();
// these are the virtual fns we need to instantiate a class
Index: Trunk/XaraLX/wxOil/sgindgen.cpp
===================================================================
--- Trunk/XaraLX/wxOil/sgindgen.cpp (revision 1360)
+++ Trunk/XaraLX/wxOil/sgindgen.cpp (revision 1361)
@@ -140,8 +140,8 @@
CC_IMPLEMENT_DYNCREATE(GenerateIndexFile, CCObject)
CC_IMPLEMENT_DYNCREATE(IndGenFileBuffer, CCObject)
-#pragma message( __LOCMSG__ "sgindgen.cpp STRIPPED" )
-#if 0
+PORTNOTE("other", "Removed most of sgindgen.cpp" )
+#ifndef EXCLUDE_FROM_XARALX
#define new CAM_DEBUG_NEW
Index: Trunk/XaraLX/wxOil/dibconv.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dibconv.cpp (revision 1360)
+++ Trunk/XaraLX/wxOil/dibconv.cpp (revision 1361)
@@ -291,7 +291,6 @@
BOOL DIBConvert::Init()
{
-//#pragma message( __LOCMSG__ "Removed GDrawAsm usage" )
if (ConvertContext == NULL)
ConvertContext = new GDrawAsm();
@@ -305,8 +304,6 @@
void DIBConvert::DeInit()
{
-//#pragma message( __LOCMSG__ "DIBConvert::DeInit - do nothing" )
-// TRACE( wxT("Warning - DIBConvert::DeInit called
") );
if (ConvertContext != NULL)
{
delete ConvertContext;
@@ -317,9 +314,6 @@
GDrawContext* DIBConvert::GetConvertContext(void)
{
-//#pragma message( __LOCMSG__ "DIBConvert::GetConvertContext - do nothing" )
-// TRACE( wxT("Warning - DIBConvert::GetConvertContext called
") );
-// return NULL;
if (ConvertContext != NULL)
return(ConvertContext);
else
Index: Trunk/XaraLX/wxOil/basebar.h
===================================================================
--- Trunk/XaraLX/wxOil/basebar.h (revision 1360)
+++ Trunk/XaraLX/wxOil/basebar.h (revision 1361)
@@ -287,44 +287,6 @@
DECLARE_DYNAMIC_CLASS( BaseBar )
DECLARE_EVENT_TABLE()
-#pragma message( __LOCMSG__ "Removed MessageMap - hopefully very temporarily" )
-/* // Generated message map functions
- //{{AFX_MSG(BaseBar)
- afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
- afx_msg void OnNcPaint();
- afx_msg BOOL OnNcActivate(BOOL bActive);
- afx_msg INT32 OnMouseActivate( CWnd* pDesktopWnd, UINT32 nHitTest, UINT32 message );
- afx_msg void OnActivate( UINT32 nState, CWnd* pWndOther, BOOL bMinimized );
- afx_msg void OnActivateApp( BOOL bActive, HTASK hTask );
- afx_msg void OnPaint();
- afx_msg UINT32 OnNcHitTest(wxPoint point);
- afx_msg void OnMouseMove(UINT32 nFlags, wxPoint point);
- afx_msg void OnNcRButtonDown(UINT32 nHitTest, wxPoint point);
- afx_msg void OnNcLButtonDown(UINT32 nHitTest, wxPoint point);
- afx_msg void OnLButtonDown(UINT32 nFlags, wxPoint point);
- afx_msg void OnLButtonUp(UINT32 nFlags, wxPoint point);
- afx_msg void OnLButtonDblClk( UINT32 nFlags, wxPoint point );
- afx_msg void OnParentNotify( UINT32 message, LPARAM lParam );
- afx_msg void OnDestroy();
- afx_msg void OnKillFocus( CWnd* Wnd );
- afx_msg void OnSetFocus( CWnd* Wnd );
- afx_msg void OnDrawItem( INT32 nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct );
- afx_msg BOOL OnMouseWheel(UINT32 nFlags, short zDelta, wxPoint pt);
-
- //}}AFX_MSG
-
- afx_msg LRESULT DoResize(WPARAM , LPARAM);
- afx_msg void ListLostFocus(void);
- afx_msg void ListSelChanged(void);
- afx_msg LRESULT SetControlFocus(WPARAM state , LPARAM Hwnd);
- afx_msg LRESULT StartControlDrag(WPARAM state , LPARAM Hwnd);
- afx_msg LRESULT EndControlDrag(WPARAM state , LPARAM Hwnd);
- afx_msg LRESULT MoveBar(WPARAM NewDockType,LPARAM NewPos);
- afx_msg LRESULT GetBarSize(WPARAM DockType , LPARAM ControlSize);
- afx_msg LRESULT QueryIsBar(WPARAM , LPARAM );
- DECLARE_MESSAGE_MAP() */
-
-
protected:
// -------------------------------------------------------------------------------------
@@ -596,8 +558,9 @@
wxRect HorizontalLargeRect;
wxRect VerticalLargeRect;
- #pragma message( __LOCMSG__ "Removed font members" )
-/* // Font to paint caption
+PORTNOTE("other", "removed fonts from bars")
+#ifndef EXCLUDE_FROM_XARALX
+ // Font to paint caption
wxFont * TitleFont;
// Font to use in bars
@@ -605,10 +568,10 @@
// Fonts to use in double decker controls
wxFont * SmallThinFont;
- wxFont * LargeThinFont; */
+ wxFont * LargeThinFont;
+#endif
-
- // Is Bar an InfoBar
+ // Is Bar an InfoBar
BOOL ThisIsAnInfoBar ;
Index: Trunk/XaraLX/wxOil/keypress.cpp
===================================================================
--- Trunk/XaraLX/wxOil/keypress.cpp (revision 1360)
+++ Trunk/XaraLX/wxOil/keypress.cpp (revision 1361)
@@ -287,10 +287,12 @@
{
Message = KM_KEYUP;
}
-#pragma message( __LOCMSG__ "Removed Windows IME usage" )
-/* case WM_IME_CHAR:
+PORTNOTE("other", "Removed Windows IME usage" )
+#ifndef EXCLUDE_FROM_XARALX
+ case WM_IME_CHAR:
TRACE( _T("IME
"));
- break; */
+ break;
+#endif
else
{
// Message was not one we're interested in, so the KeyPressSysMsg object is invalid
@@ -317,8 +319,8 @@
return;
}
-#pragma message( __LOCMSG__ "Removed some keypress mangling" )
-#if 0
+PORTNOTE("other", "Removed some keypress mangling" )
+#ifndef EXCLUDE_FROM_XARALX
RepeatCount = KeyData & 0xffff;
ScanCode = (KeyData >> 16) & 0xff;
Extended = (KeyData & (1<<24)) != 0;
@@ -451,23 +453,24 @@
BOOL KeyPress::DispatchKeyEvent(UINT32 nMsgID, UINT32 nChar, UINT32 nRepCnt, UINT32 nFlags)
{
-#pragma message( __LOCMSG__ "BaseTextClass::PreOpProcessing - do nothing" )
- TRACE( _T("Warning - BaseTextClass::PreOpProcessing called") );
-/* // For compatibility with existing code we must repackage the unpacked message.
+ // Make sure the kernel knows which view/doc the event applies to, if any.
+ if (Document::GetSelected() != NULL) Document::GetSelected()->SetCurrent();
+ if (DocView::GetSelected() != NULL) DocView::GetSelected()->SetCurrent();
+
+PORTNOTETRACE("other,", "BaseTextClass::PreOpProcessing - do nothing" );
+#ifndef EXCLUDE_FROM_XARALX
+ // For compatibility with existing code we must repackage the unpacked message.
// NB. the RHS of the lParam expression will work for Win16 as well.
MSG msg;
msg.message = nMsgID;
msg.wParam = nChar;
msg.lParam = (nRepCnt & 0xFFFF) | ((((LPARAM) nFlags) & 0xFFFF) << 16);
-
- // Make sure the kernel knows which view/doc the event applies to, if any.
- if (Document::GetSelected() != NULL) Document::GetSelected()->SetCurrent();
- if (DocView::GetSelected() != NULL) DocView::GetSelected()->SetCurrent();
// Call the key-press system.
- return TranslateMessage(&msg); */
-
+ return TranslateMessage(&msg);
+#else
return true;
+#endif
}
@@ -1364,7 +1367,8 @@
BOOL KeyPress::IsEscapePressed()
{
-#pragma message( __LOCMSG__ "KeyPress::IsEscapePressed - do nothing" )
+PORTNOTE("other", "KeyPress::IsEscapePressed - do nothing" )
+#ifndef EXCLUDE_FROM_XARALX
// TRACE( _T("Warning - KeyPress::IsEscapePressed called") );
/* BOOL EscapePressed = (GetAsyncKeyState(CAMKEY(ESCAPE)) != 0);
BOOL Pressed = EscapePressed || (GetAsyncKeyState(CAMKEY(CANCEL)) != 0);
@@ -1412,7 +1416,7 @@
}
return (Pressed); */
-
+#endif
return false;
}
@@ -1598,8 +1602,10 @@
// Only post the ASCII value if one's been specified via the Num key pad
// (i.e. the value >= 0)
//TRACE( _T("-*-*-*-- Posting WM_CHAR. Val = %ld
"),KeyPress::AsciiVal);
-#pragma message( __LOCMSG__ "Removed PostMessage usage - WM_CHAR from ascii code" )
-// Processed = ::PostMessage(pMsg->hwnd,WM_CHAR,KeyPress::AsciiVal % 256,1);
+PORTNOTE("other", "Removed PostMessage usage - WM_CHAR from ascii code" )
+#ifndef EXCLUDE_FROM_XARALX
+ Processed = ::PostMessage(pMsg->hwnd,WM_CHAR,KeyPress::AsciiVal % 256,1);
+#endif
}
//TRACE( _T("-*-*-*-- (keyup) Invalidating ascii val. Val = %ld
"),KeyPress::AsciiVal);
KeyPress::ValidAsciiVal = FALSE;
@@ -1844,9 +1850,9 @@
void KeyPress::DumpKeyMessage(wxKeyEvent* pMsg)
{
-#pragma message( __LOCMSG__ "KeyPress::DumpKeyMessage - do nothing" )
- TRACE( _T("Warning - KeyPress::DumpKeyMessage called") );
-/* //if (!IsUserName("Markn")) return;
+ PORTNOTETRACE("other", "KeyPress::DumpKeyMessage - do nothing" );
+#ifndef EXCLDUE_FROM_XARALX
+ //if (!IsUserName("Markn")) return;
KeyPressSysMsg KeySysMsg(pMsg);
WCHAR c = 1;
@@ -1900,7 +1906,8 @@
TRACE( _T("KeyPress::AlternativeStateLeft = %lx
"),KeyPress::AlternativeStateLeft);
TRACE( _T("KeyPress::AlternativeStateRight = %lx
"),KeyPress::AlternativeStateRight);
}
- } */
+ }
+#endif
}
#endif // _DEBUG
Index: Trunk/XaraLX/wxOil/dockbar.h
===================================================================
--- Trunk/XaraLX/wxOil/dockbar.h (revision 1360)
+++ Trunk/XaraLX/wxOil/dockbar.h (revision 1361)
@@ -219,8 +219,10 @@
virtual wxSize GetBarSize () = 0;
#ifdef _DEBUG
virtual void AssertValid() const;
-#pragma message( __LOCMSG__ "Removed OILDockingBar::Dump" )
-// virtual void Dump(CDumpContext& dc) const;
+PORTNOTE("other", "Removed OILDockingBar::Dump" )
+#ifndef EXCLUDE_FROM_XARALX
+ virtual void Dump(CDumpContext& dc) const;
+#endif
void Dump_List();
#endif
@@ -228,8 +230,10 @@
DECLARE_DYNAMIC_CLASS( OILDockingBar )
DECLARE_EVENT_TABLE()
-#pragma message( __LOCMSG__ "Removed OILDockingBar::OnUpdateCmdUI" )
-// void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) ;
+PORTNOTE("other", "Removed OILDockingBar::OnUpdateCmdUI" )
+#ifndef EXCLUDE_FROM_XARALX
+ void OnUpdateCmdUI(CFrameWnd* pTarget, BOOL bDisableIfNoHndler) ;
+#endif
//{{AFX_MSG(OILDockingBar)
//}}AFX_MSG
@@ -299,20 +303,23 @@
BOOL SetSlotSize(INT32 SlotNo, INT32 NewSize);
BOOL DeleteBars();
-#pragma message( __LOCMSG__ "Removed OILFixedDockingBar::RepositionWindow" )
-// void RepositionWindow(AFX_SIZEPARENTPARAMS FAR* lpLayout,
-// wxWindow* wxWindow*, LPCRECT lpRect);
+PORTNOTE("other", "Removed OILDockingBar::RepositionWindow" )
+#ifndef EXCLUDE_FROM_XARALX
+ void RepositionWindow(AFX_SIZEPARENTPARAMS FAR* lpLayout,
+ wxWindow* wxWindow*, LPCRECT lpRect);
+#endif
static void DoNotTidyBars () { allowTidyBars = FALSE; }
static void AllowTidyBars () { allowTidyBars = TRUE; }
#ifdef _DEBUG
virtual void AssertValid() const;
-#pragma message( __LOCMSG__ "Removed OILFixedDockingBar::Dump" )
-// virtual void Dump(CDumpContext& dc) const;
+PORTNOTE("other", "Removed OILDockingBar::Dump" )
+#ifndef EXCLUDE_FROM_XARALX
+ virtual void Dump(CDumpContext& dc) const;
void Dump_List();
#endif
-
+#endif
protected:
// to erase the background
wxBrush BackBrush;
Index: Trunk/XaraLX/wxOil/offscrn.h
===================================================================
--- Trunk/XaraLX/wxOil/offscrn.h (revision 1360)
+++ Trunk/XaraLX/wxOil/offscrn.h (revision 1361)
@@ -118,8 +118,6 @@
#define MILLIPOINTS_PER_INCH 72000.0
#define INCHES_PER_METRE (100.0 / 2.54)
-//#pragma message( __LOCMSG__ "We're only interested in the consts for now" )
-#if 1
/////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -273,6 +271,4 @@
View* m_pView;
};
-#endif//0
-
#endif //INC_OFFSCREEN_RR
Index: Trunk/XaraLX/wxOil/oilmods.cpp
===================================================================
--- Trunk/XaraLX/wxOil/oilmods.cpp (revision 1360)
+++ Trunk/XaraLX/wxOil/oilmods.cpp (revision 1361)
@@ -182,8 +182,10 @@
HINSTANCE hLibrary = (HINSTANCE)HINSTANCE_ERROR;
-#pragma message( __LOCMSG__ "Removed SetErrorMode usage" )
-// SetErrorMode( SEM_NOOPENFILEERRORBOX ); // don't cause errors
+PORTNOTE("other", "Removed SetErrorMode usage" )
+#ifndef EXCLUDE_FROM_XARALX
+ SetErrorMode( SEM_NOOPENFILEERRORBOX ); // don't cause errors
+#endif
// Still need the DLLs for the module/tool resources.
@@ -261,8 +263,10 @@
AbnormalExit:
// Out of memory - clean up and fail
TRACEUSER( "Tim", _T("OILModule::Init(): memory exhausted") );
-#pragma message( __LOCMSG__ "Removed SetErrorMode usage" )
+PORTNOTE("other", "Removed FreeLibrary usage" )
+#ifndef EXCLUDE_FROM_XARALX
// FreeLibrary(hLibrary);
+#endif
DLLs[0] = (HINSTANCE)HINSTANCE_ERROR;
DLLCount--;
return FALSE;
Xara