[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-commits] Commit Complete



Commit by  : alex
Repository : xara
Revision   : 758
Date       : Sat Apr  1 18:17:50 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/Makefile.am
   M /Trunk/XaraLX/Kernel/main2.cpp
   A /Trunk/XaraLX/Scripts/bmpconv
   M /Trunk/XaraLX/tools/Makefile.am
   M /Trunk/XaraLX/tools/textinfo.cpp
   M /Trunk/XaraLX/tools/textops.cpp
   M /Trunk/XaraLX/tools/textops.h
   M /Trunk/XaraLX/tools/viewmod.cpp
   M /Trunk/XaraLX/wxOil/compatdef.h
   M /Trunk/XaraLX/wxOil/fontdrop.h
   A /Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT-s.png
   A /Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT.png
   A /Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT-s.png
   A /Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT.png
   A /Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLANKCURSOR.cur
   A /Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLOBCURSOR.cur
   A /Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLINDENTCURSOR.cur
   A /Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT-s.png
   A /Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT.png

Made text tool sort of work


Diff:
Index: Trunk/XaraLX/tools/textops.h
===================================================================
--- Trunk/XaraLX/tools/textops.h	(revision 757)
+++ Trunk/XaraLX/tools/textops.h	(revision 758)
@@ -610,7 +610,7 @@
 	static ActionCode Init( Operation* pOp,
 							ActionList* pActionList,
 							TextStory* pStory,
-							bool NewIsAutoKerning);
+							BOOL NewIsAutoKerning);
 
 protected:
 	TextStory*	pTextStory;
Index: Trunk/XaraLX/tools/textinfo.cpp
===================================================================
--- Trunk/XaraLX/tools/textinfo.cpp	(revision 757)
+++ Trunk/XaraLX/tools/textinfo.cpp	(revision 758)
@@ -131,7 +131,7 @@
 #include "fontman.h"
 #include "fontdrop.h"
 #include "fontbase.h"
-#include "sgfonts.h"
+//#include "sgfonts.h"
 #include "localenv.h"
 #include "unicdman.h"
 #include "docview.h"
@@ -182,7 +182,10 @@
 CommonAttrSet 	  TextInfoBarOp::CommonAttrsToFindSet; 	// A set which will contain all attribute types
 														// that we need to find common attributes for
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 FontDropDown	*TextInfoBarOp::NameDropDown = NULL;	// Font name drop-down list support for the font list and
+#endif
 
 String_64 	TextInfoBarData::FontName;
 FontClass 	TextInfoBarData::FontType;
@@ -250,6 +253,8 @@
 
 BOOL TextInfoBarOp::IsDisplayFontInstalled()
 {
+PORTNOTE("text", "Removed IsDisplayFontInstalled");
+#ifndef EXCLUDE_FROM_XARALX
 	// if we are running on a DBCS OS then we don't use our display font at all.
 	if (UnicodeManager::IsDBCSOS())
 		return TRUE;
@@ -280,6 +285,9 @@
 	// is it one of ours ?
 	String_32 CCSmall(_R(IDS_FONTS_EDITFIELDSMALL)); // "CCSMALL"
 	return _tcsncmp(buff, (TCHAR *)CCSmall, 64)==0;
+#else
+	return FALSE;
+#endif
 }
 
 
@@ -331,12 +339,15 @@
 	// DeleteFontCache();
 	pTextInfoBar= NULL;
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 	// Delete our drop-down font list
 	if (NameDropDown != NULL)
 	{
 		delete NameDropDown;
 		NameDropDown = NULL;
 	}
+#endif
 
 }
 
@@ -702,10 +713,13 @@
 	if(!pTextInfoBar->HasWindow())
 		return ;
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 	// Font Name
 	NameDropDown->SetTopFontName(&InfoData.FontName, InfoData.FontType, FALSE);
 	FontDropItem Dummy(InfoData.FontName, InfoData.FontType);
 	NameDropDown->SetSelection(&Dummy);
+#endif
 
 	// Kerning
 	pTextInfoBar->SetLongGadgetValue(_R(IDC_KERN_EDIT_X),InfoData.HorizontalKern,0,-1);
@@ -909,10 +923,13 @@
 
  	if (result == SelRange ::ATTR_MANY)
 	{
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 		String_64 Multiple(_R(IDS_TEXTTOOL_MULTIPLE));
 		NameDropDown->SetTopFontName(&Multiple, FC_UNDEFINED, TRUE);
 		ForceUpdate = TRUE;
 		InfoData.FontName = _R(IDS_TEXTINFO_MULTIPLE); // "Multiple" just to invalidate this field
+#endif
 	}
 	else 
 	{
@@ -969,13 +986,15 @@
 				else
 					ItalicChanged = FALSE;
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 				NameDropDown->SetTopFontName(&FontName, InfoData.FontType, Deselect);
 				if(!Deselect)
 				{
 					FontDropItem Dummy(InfoData.FontName, InfoData.FontType);
 					NameDropDown->SetSelection(&Dummy);
 				}
-
+#endif
 				ForceUpdate = !ThisData->IsValid();
  			}
  		}
@@ -1424,12 +1443,12 @@
 	pTextInfoBar->EnableGadget(_R(IDC_TRACKINGBIT) ,Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_KERNINGBIT) ,Enable);
 
-	pTextInfoBar->EnableGadget(_R(IDC_TEXT),Enable);
+//	pTextInfoBar->EnableGadget(_R(IDC_TEXT),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_FONT_COMBO),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_POINT_COMBO),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_BOLDBUTTON),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_ITALICBUTTON),Enable);
-	pTextInfoBar->EnableGadget(_R(IDC_UNDERLINEBUTTON),Enable);
+//	pTextInfoBar->EnableGadget(_R(IDC_UNDERLINEBUTTON),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_ASPECTBIT),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_ASPECTEDIT),Enable);
 	pTextInfoBar->EnableGadget(_R(IDC_JUSTIFYLEFT),Enable);
@@ -1638,9 +1657,12 @@
 	if (Cache)
 		FONTMANAGER->CacheNamedFont(Name, Type);
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 	NameDropDown->SetTopFontName(Name, Type, FALSE);
 	FontDropItem Dummy(*Name, Type);
 	NameDropDown->SetSelection(&Dummy);
+#endif
 
 	return TRUE;
 }
@@ -1947,6 +1969,8 @@
 	if (pFontChange!=NULL)
 		pFontChange->DoAffectFontChange();
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 	// Update the text info bar font drop list (if it's there)
 	if(NameDropDown != NULL)
 	{
@@ -1955,6 +1979,7 @@
 		FontDropItem Dummy(InfoData.FontName, InfoData.FontType);
 		NameDropDown->SetSelection(&Dummy);
 	}
+#endif
 
 	// Update the actual combobox if the texttool is active
 	if(pTextInfoBar!= NULL &&pTextInfoBar->HasWindow())
@@ -2502,6 +2527,8 @@
 			{
 				if(Msg->DlgMsg == DIM_SELECTION_CHANGED_COMMIT)
 				{
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 					// Handle selections in the font name menu.
 					INT32 SelIndex = GetSelectedValueIndex(_R(IDC_FONT_COMBO));
 					
@@ -2523,6 +2550,7 @@
 							}			 
 						}
 					}
+#endif
 				}
 			}
 		}
@@ -2571,7 +2599,8 @@
 				CCamView* pOilView = msg->pOldDocView->GetConnectionToOilView();
 				BlobManager* pBlobManager = GetApplication()->GetBlobManager();
 
-				if (pOilView!=NULL && pOilView->IsScreenCamView())
+PORTNOTE("text", "Removed IsScreenCamView() test");
+				if (pOilView!=NULL /*&& pOilView->IsScreenCamView()*/)
 					pBlobManager->RenderToolBlobsOff(pTextTool, msg->pOldDocView->GetVisibleSpread(), NULL);
 			}
 		}
@@ -2699,6 +2728,8 @@
 	// current info bar public for callbacks argh..
 	pTextInfoBar = this;
 
+PORTNOTE("text", "Removed custom dropdown");
+#ifndef EXCLUDE_FROM_XARALX
 	// Only enum the fonts if it's the first time - should respond to font change messages now !
 	if (NameDropDown == NULL)
 	{
@@ -2710,6 +2741,7 @@
 		NameDropDown->Init((CWindowID)WindowID, _R(IDC_FONT_COMBO));
 		NameDropDown->FillInFontList();
 	}
+#endif
 
 	pTextInfoBar->SetComboListLength(_R(IDC_FONT_COMBO));
  	UpdateGadgets();
Index: Trunk/XaraLX/tools/viewmod.cpp
===================================================================
--- Trunk/XaraLX/tools/viewmod.cpp	(revision 757)
+++ Trunk/XaraLX/tools/viewmod.cpp	(revision 758)
@@ -116,7 +116,7 @@
 #include "regshape.h"
 #include "rectangl.h"
 #include "moldtool.h"
-//#include "texttool.h"
+#include "texttool.h"
 #include "shadtool.h"	// shadow tool header, Olivier 29/10/96
 //#include "blnktool.h"
 #include "cntrtool.h"  // contour tool, DavidM 24/8/99
@@ -166,7 +166,7 @@
 
 BOOL ViewModule::Init()
 {
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 #ifdef STANDALONE
 	TextTool* pTextTool = new TextTool();
 	if (pTextTool)
@@ -298,11 +298,8 @@
 #endif
 #endif	//WEBSTER-Martin-06/11/96-end
 
-PORTNOTE("other","Removed text tool usage")
-#ifndef EXCLUDE_FROM_XARALX
 		case 16:
 			return IN_DLL(TextTool);
-#endif
 
 #ifndef NO_ADVANCED_TOOLS
 PORTNOTE("other","Removed effects tool usage")
Index: Trunk/XaraLX/tools/textops.cpp
===================================================================
--- Trunk/XaraLX/tools/textops.cpp	(revision 757)
+++ Trunk/XaraLX/tools/textops.cpp	(revision 758)
@@ -50,7 +50,7 @@
 SCOPE OF LICENSE
 ----------------
 
-This license applies to this program (XaraLX) and its constituent source
+This license applies to this program () and its constituent source
 files only, and does not necessarily apply to other Xara products which may
 in part share the same code base, and are subject to their own licensing
 terms.
@@ -152,6 +152,7 @@
 #include "slicehelper.h"
 #include "becomea.h"
 #include "opliveeffects.h"
+#include "ophist.h"
 
 extern void Beep();
 
@@ -159,7 +160,7 @@
 
 
 // CC_IMPLEMENTS for all classes
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)		
+#if !defined(EXCLUDE_FROM_RALPH)
 // Base class
 CC_IMPLEMENT_DYNCREATE(OpTextUndoable, SelOperation)
 
@@ -187,7 +188,7 @@
 CC_IMPLEMENT_DYNCREATE(OpTextSelection, Operation)
 #endif
 CC_IMPLEMENT_DYNCREATE(OpApplyGlobalAffect, Operation)
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 CC_IMPLEMENT_DYNCREATE(OpApplyJustificationToStory, Operation)
 CC_IMPLEMENT_DYNCREATE(OpApplyLeftJustifyToStory, OpApplyJustificationToStory)
 CC_IMPLEMENT_DYNCREATE(OpApplyCentreJustifyToStory, OpApplyJustificationToStory)
@@ -198,7 +199,7 @@
 
 CC_IMPLEMENT_DYNCREATE(PrePostTextAction, Action)
 CC_IMPLEMENT_DYNCREATE(ToggleAutoKerningAction, Action)
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 CC_IMPLEMENT_DYNCREATE(PositionCaretAction, Action)
 CC_IMPLEMENT_DYNCREATE(StorePathIndentAction, Action)
 #endif
@@ -217,7 +218,7 @@
 // optimisation correctly
 #define SELECT_CARET_AND_CHARS
 
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 // statics
 VerticalInsetStore OpTextCaret::VertInset;
 
@@ -382,7 +383,8 @@
 						ok = FALSE;
 					else
 					{
-						pKern->SetValue(DocCoord(KernDist,0));
+						DocCoord kd(KernDist,0);
+						pKern->SetValue(kd);
 						ok = DoInsertNewNode(pKern,pTextStory->FindFirstChild(CC_RUNTIME_CLASS(TextLine)),
 																				FIRSTCHILD,FALSE,FALSE,FALSE);
 						// Also insert a zero kern so the caret appears in the correct
@@ -393,7 +395,8 @@
 								ok = FALSE;
 							else
 							{
-								pKern->SetValue(DocCoord(0,0));
+								DocCoord kd(0,0);
+								pKern->SetValue(kd);
 								ok = DoInsertNewNode(pKern,pTextStory->FindFirstChild(CC_RUNTIME_CLASS(TextLine)),
 																					FIRSTCHILD,FALSE,FALSE,FALSE);
 							}
@@ -1014,7 +1017,7 @@
 
 				ok = (Result != Failed);
 
-				if (ok && (Result != Unknown))
+				if (ok && (Result != UnknownType))
 				{
 					// Store the characters old UniCode value
 					ok = StoreCharCodeAction::DoStoreCharacterCode( this, &UndoActions, pSwapTextChar);
@@ -1815,6 +1818,8 @@
 		Node* pCompoundAboveObj = NULL;
 		Node* pCompoundAboveText = NULL;
 
+PORTNOTE("other", "Removed live effects usage from text");
+#ifndef EXCLUDE_FROM_XARALX
 		// Find controller/effect stacks above the object and the text story
 		ListRange* pStack = EffectsStack::GetEffectsStackFromNode(pObject, FALSE, TRUE, TRUE);
 		if (pStack)
@@ -1836,6 +1841,7 @@
 			OpLiveEffect::DoDeleteAllPostProcessors(this, pObject, TRUE, TRUE);
 			pCompoundAboveObj = NULL;
 		}
+#endif
 
 		// We want to translate the story so it sits near the start of the path
 		// so that attributes and effects are in roughly the right position.
@@ -1844,7 +1850,7 @@
 		DocRect ObjectBounds = pObject->GetBoundingRect();
 		DocRect StoryBounds = pStory->GetBoundingRect();
 
-		Trans2DMatrix* pTransMat = new Trans2DMatrix(Matrix(ObjectBounds.lox-StoryBounds.lox, ObjectBounds.loy-StoryBounds.loy));
+		Trans2DMatrix* pTransMat = new Trans2DMatrix(Matrix(ObjectBounds.lo.x-StoryBounds.lo.x, ObjectBounds.lo.y-StoryBounds.lo.y));
 		ok = (pTransMat!=NULL);
 		if (ok)
 			ok = DoTransformNode(pStory, pTransMat);
@@ -1938,7 +1944,7 @@
 {
 	OpState OpSt;
 
-	Range* pSelRange = GetApplication()->FindSelection(); 
+//	Range* pSelRange = GetApplication()->FindSelection(); 
 	*pStory = NULL;
 	*pPath= NULL;
 
@@ -2409,7 +2415,7 @@
 	return Act;
 }
 
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // OpTextCaret methods
@@ -3830,7 +3836,7 @@
 	OpTextSelection::SelectionPos ClickPos = TO_LEFT;
 	if (pSelectChar->IsAnAbstractTextChar())
 		ClickPos = IsClickToLeftHalfOfChar((AbstractTextChar*)pSelectChar, StartPoint, TRUE);
-	ERROR3IF(ClickPos == NOT_NEAR,"Selection point was not near the character claimed")
+	ERROR3IF(ClickPos == NOT_NEAR,"Selection point was not near the character claimed");
 	if (ClickPos == TO_LEFT)
 		pSelectionStory->MoveCaretToCharacter(pSelectChar, PREV);
 	if (ClickPos == TO_RIGHT)
@@ -3886,7 +3892,7 @@
 		{
 			if (CharRect.ContainsCoord(ClickPoint) || MustChoose)
 			{
-				if (ClickPoint.x > ((CharRect.lox+CharRect.hix)/2))
+				if (ClickPoint.x > ((CharRect.lo.x+CharRect.hi.x)/2))
 					Result = TO_RIGHT;
 				else
 					Result = TO_LEFT;
@@ -3960,9 +3966,9 @@
 	}
 	else
 	{
-		BOOL CurrentForwardsDirection = TRUE;
+//		BOOL CurrentForwardsDirection = TRUE;
 		BOOL NewForwardsDirection = TRUE;
-		VisibleTextNode* pSelEnd = pSelectionStory->GetSelectionEnd(&CurrentForwardsDirection);
+//		VisibleTextNode* pSelEnd = pSelectionStory->GetSelectionEnd(&CurrentForwardsDirection);
 		CaretNode* pCaret = pSelectionStory->GetCaret();
 		ERROR2IF(pCaret == NULL, FALSE, "Caret not found");
 		
@@ -4155,7 +4161,7 @@
 
 void OpDeleteTextStory::DoWithParam(OpDescriptor* pOpDesc, OpParam* pParam)
 {
-	TextStory* pStory = (TextStory*) pParam->Param1;
+	TextStory* pStory = (TextStory*) (void *) pParam->Param1;
 	if (pStory == NULL)
 	{
 		ERROR3("Story pointer was NULL");
@@ -4278,7 +4284,10 @@
 			{
 				OpDescriptor* OpDesc = OpDescriptor::FindOpDescriptor(CC_RUNTIME_CLASS(OpDeleteTextStory));
 				if (OpDesc != NULL)
-					OpDesc->Invoke(&OpParam((INT32)pTS,0));
+				{
+					OpParam p((void*)pTS,0);
+					OpDesc->Invoke(&p);
+				}
 				else
 					ok = FALSE;
 			}
@@ -4795,7 +4804,11 @@
 	}
 
 	// create a range of nodes which have been pasted
-	if (ok) *pPasteRange = Range(pFirstPastedVTN, pLastPastedVTN, RangeControl(TRUE,TRUE,FALSE)); 
+	if (ok)
+	{
+		Range r(pFirstPastedVTN, pLastPastedVTN, RangeControl(TRUE,TRUE,FALSE));
+		*pPasteRange = r;
+	}
 	return ok;
 }
 
@@ -5625,7 +5638,7 @@
 
 	INT32 NearEl=0;
 	double mu=0.0;
-	double SqrDist = mpStoryPath->InkPath.SqrDistanceToPoint(Current, &NearEl, &mu);
+//	double SqrDist = mpStoryPath->InkPath.SqrDistanceToPoint(Current, &NearEl, &mu);
 	DocCoord LinePoint = mpStoryPath->InkPath.ClosestPointTo(mu, NearEl);
 
 	// We need to stop the left hand blob going past the right hand one.
@@ -5660,7 +5673,7 @@
 	
 	INT32 NearEl=0;
 	double mu=0.0;
-	double SqrDist = mpStoryPath->InkPath.SqrDistanceToPoint(Current, &NearEl, &mu);
+//	double SqrDist = mpStoryPath->InkPath.SqrDistanceToPoint(Current, &NearEl, &mu);
 	DocCoord LinePoint = mpStoryPath->InkPath.ClosestPointTo(mu, NearEl);
 
 	// We need to stop the right hand blob going past the left hand one.
@@ -5742,7 +5755,7 @@
 ********************************************************************************************/
 BOOL OpDragStoryPathIndent::SetCurrentPos(DocCoord MousePos, ClickModifiers ClickMods)
 {
-	ERROR2IF(mpStoryPath==NULL, FALSE, "NULL story pointer")
+	ERROR2IF(mpStoryPath==NULL, FALSE, "NULL story pointer");
 
 	mCurrentBlobPos = InternalConstrain(MousePos, ClickMods);
 
@@ -5763,7 +5776,7 @@
 ********************************************************************************************/
 BOOL OpDragStoryNonPathIndent::SetCurrentPos(DocCoord MousePos, ClickModifiers ClickMods)
 {
-	ERROR3IF(mpStoryPath!=NULL, "Story is on a path, you don't want to use this function")
+	ERROR3IF(mpStoryPath!=NULL, "Story is on a path, you don't want to use this function");
 
 	mCurrentBlobPos = InternalConstrain(MousePos, ClickMods);
 
@@ -5956,7 +5969,7 @@
 	if (!pDocument)
 		pDocument = (Document*) Camelot.Documents.GetHead();
 
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 	// render blobs off (only in selected doc)
 	if (Camelot.FindSelection()!=NULL)
 	{
@@ -5995,7 +6008,7 @@
 	pObjChange->Define(OBJCHANGE_FINISHED,pObjChange->GetChangeFlags(),NULL,NULL);
 	UpdateAllChangedNodes(pObjChange);
 
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
 	// render blobs back on again!
 	if (Camelot.FindSelection()!=NULL)
 	{
Index: Trunk/XaraLX/tools/Makefile.am
===================================================================
--- Trunk/XaraLX/tools/Makefile.am	(revision 757)
+++ Trunk/XaraLX/tools/Makefile.am	(revision 758)
@@ -12,5 +12,5 @@
 	rectangl.cpp regshape.cpp eliptool.cpp oprshape.cpp filltool.cpp beztool.cpp \
 	opbezier.cpp opshadow.cpp shadtool.cpp shadinfo.cpp freeinfo.cpp opfree.cpp opdrbrsh.cpp \
 	freehand.cpp opretro.cpp moldtool.cpp bevinfo.cpp bevtool.cpp cntrtool.cpp opcntr.cpp \
-	pentool.cpp
+	pentool.cpp texttool.cpp textinfo.cpp textops.cpp
 AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am	(revision 757)
+++ Trunk/XaraLX/Kernel/Makefile.am	(revision 758)
@@ -20,7 +20,7 @@
 	doccomp.cpp doccoord.cpp docrect.cpp document.cpp docview.cpp dumbnode.cpp \
 	exphint.cpp extender.cpp fillattr.cpp fillramp.cpp fillval.cpp filters.cpp \
 	filtrmgr.cpp fontcomp.cpp fontlist.cpp fontman.cpp fracfill.cpp fthrattr.cpp \
-        gcache.cpp fntcache.cpp \
+	gcache.cpp fntcache.cpp textacts.cpp \
 	fttyplis.cpp gadget.cpp gblend.cpp genv.cpp gla.cpp gmould.cpp \
 	grid.cpp group.cpp guides.cpp gwinding.cpp hittest.cpp hotkeys.cpp impbmp.cpp \
 	impcol.cpp impstr.cpp infocomp.cpp insertnd.cpp invalid.cpp isetattr.cpp \
Index: Trunk/XaraLX/Kernel/main2.cpp
===================================================================
--- Trunk/XaraLX/Kernel/main2.cpp	(revision 757)
+++ Trunk/XaraLX/Kernel/main2.cpp	(revision 758)
@@ -435,11 +435,9 @@
 #ifndef STANDALONE
 			OpNodePathEditBlob::Init() &&		// Node path editing itself operation
 			OpNodePathEditControlBlob::Init() &&	// Node path editing its control points operation
-#ifndef EXCLUDE_FROM_XARALX
 			OpFitTextToCurve::Init() &&			// Fit text line to path
 			OpTextKern::Init() &&				// Apply kern op
 			OpTextAutoKern::Init() &&			// Apply kern op
-#endif
 			OpJoinShapes::Init() &&				// Join shapes operation
 			OpBreakShapes::Init() &&			// Break shapes operation
 			OpNodePathAddEndpoint::Init() &&	// op to add a curve or line at the end of a path
Index: Trunk/XaraLX/Scripts/bmpconv
===================================================================
--- Trunk/XaraLX/Scripts/bmpconv	(revision 0)
+++ Trunk/XaraLX/Scripts/bmpconv	(revision 758)
@@ -0,0 +1,2 @@
+#!/bin/sh
+bmptopnm | pnmtopng -transparent magenta

Property changes on: Trunk/XaraLX/Scripts/bmpconv
___________________________________________________________________
Name: svn:executable
   + *

Index: Trunk/XaraLX/wxOil/compatdef.h
===================================================================
--- Trunk/XaraLX/wxOil/compatdef.h	(revision 757)
+++ Trunk/XaraLX/wxOil/compatdef.h	(revision 758)
@@ -713,6 +713,8 @@
 // Key bindings
 #define CAMKEY(x) WXK_ ## x
 
+inline void Beep() {wxBell();}
+
 // The following line makes normalize.pl stop skipping this file
 // Leave it at the end
 /* SKIPFIXTYPES: END */
Index: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLANKCURSOR.cur
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLANKCURSOR.cur
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLOBCURSOR.cur
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLBLOBCURSOR.cur
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLINDENTCURSOR.cur
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_TEXTTOOLINDENTCURSOR.cur
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT-s.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_ASPECTBIT-s.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT-s.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_TRACKINGBIT-s.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT-s.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDC_KERNINGBIT-s.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/fontdrop.h
===================================================================
--- Trunk/XaraLX/wxOil/fontdrop.h	(revision 757)
+++ Trunk/XaraLX/wxOil/fontdrop.h	(revision 758)
@@ -165,6 +165,7 @@
 
 ********************************************************************************************/
 
+#ifndef EXCLUDE_FROM_XARALX
 class FontDropDown : public DropDown
 {
 friend class DialogManager;
@@ -232,6 +233,7 @@
 	BOOL RedrawingTopItem;
 
 };
+#endif
 
 /********************************************************************************************
 
@@ -245,6 +247,7 @@
 				document rather than the fonts avalaible in the system.
 ********************************************************************************************/
 
+#ifndef EXCLUDE_FROM_XARALX
 class DocumentFontDropDown : public FontDropDown
 {
 
@@ -261,6 +264,6 @@
 	BOOL FillInFontList(Document * WorkDoc);
 
 };
+#endif
 
-
 #endif


Xara