[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1750
Date       : Tue Sep 12 09:59:57 BST 2006

Changed paths:
   M /Trunk/XaraLX/tools/freehand.cpp

Improve brush selection


Diff:
Index: Trunk/XaraLX/tools/freehand.cpp
===================================================================
--- Trunk/XaraLX/tools/freehand.cpp	(revision 1749)
+++ Trunk/XaraLX/tools/freehand.cpp	(revision 1750)
@@ -833,11 +833,14 @@
 				Progress Hourglass(&ProgString, -1, FALSE);
 				m_pGRenderBrush = GetBigGRenderBrush(pSpread);
 				
+PORTNOTE("other", "Removed m_pGRenderBrush support");
+#ifndef EXCLUDE_FROM_XARALX
 				if (m_pGRenderBrush == NULL)
 				{
 					ToolInformError(_R(IDS_OUT_OF_MEMORY), _R(IDS_OK));
 					return;
 				}
+#endif
 				m_LastBrushDocument = CurrentDoc;
 				return;
 			
@@ -1993,8 +1996,6 @@
 
 void FreeHandTool::LaunchBrushDefinitionDialog(BrushHandle Handle)
 {
-PORTNOTE("other", "Removed m_pGRenderBrush support");
-#ifndef EXCLUDE_FROM_XARALX
 	// first get the brush definition from the component
 	// get the brush component from the document
 	Document* pDoc = Document::GetCurrent();
@@ -2010,6 +2011,8 @@
 	
 	if (pData != NULL)
 	{
+PORTNOTE("other", "Removed CBrushGadget support");
+#ifndef EXCLUDE_FROM_XARALX
 		// get the line gallery, as we want to edit the definition version
 		LineGallery* pLineGallery = LineGallery::GetInstance();
 		if (pLineGallery != NULL)
@@ -2027,8 +2030,8 @@
 			// we need to delete the data
 			delete pData;
 		}
+#endif
 	}
-#endif
 }
 
 /***********************************************************************************************
@@ -2394,8 +2397,6 @@
 
 BOOL FreeHandTool::BrushSelected(BrushHandle Handle, BOOL ApplyToSelection)
 {
-PORTNOTE("other", "Removed m_pGRenderBrush support");
-#ifndef EXCLUDE_FROM_XARALX
 	if (m_UpdateBrushState == UPDATE_NEVER)
 		return TRUE;
 
@@ -2427,14 +2428,19 @@
 	// if its the 'null' brush then just kill the render region and leave
 	if (m_BrushHandle == BrushHandle_NoBrush)
 	{
+PORTNOTE("other", "Removed m_pGRenderBrush support");
+#ifndef EXCLUDE_FROM_XARALX
 		if (m_pGRenderBrush != NULL)
 		{
 			delete m_pGRenderBrush;
 			m_pGRenderBrush = NULL;
 		}
+#endif
 		return TRUE;
 	}
 
+PORTNOTE("other", "Removed m_pGRenderBrush support");
+#ifndef EXCLUDE_FROM_XARALX
 	// if we are <24BPP display then make the whole thing again from scratch
 	// as we will need different sized brush bitmaps and everything
 	if (m_pGRenderBrush != NULL && m_pGRenderBrush->GetScreenDepth() < 24)


Xara