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

[XaraXtreme-commits] Commit Complete



Commit by  : phil
Repository : xara
Revision   : 808
Date       : Thu Apr 13 11:24:28 BST 2006

Changed paths:
   A /Trunk/XaraLX/Kernel/animparams.cpp
   A /Trunk/XaraLX/Kernel/animparams.h
   A /Trunk/XaraLX/Kernel/filter_types.h
   A /Trunk/XaraLX/Kernel/jpglib_namespace.h
   A /Trunk/XaraLX/Kernel/webparam.cpp

New files to support DO_EXPORT changes


Diff:
Index: Trunk/XaraLX/Kernel/animparams.cpp
===================================================================
--- Trunk/XaraLX/Kernel/animparams.cpp	(revision 0)
+++ Trunk/XaraLX/Kernel/animparams.cpp	(revision 808)
@@ -0,0 +1,184 @@
+// $Id: animparams.cpp3 2006-04-10 09:36:42Z alex $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) 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.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+
+#include "camtypes.h"
+
+#include "animparams.h"
+
+CC_IMPLEMENT_DYNAMIC(AnimPropertiesParam, OpParam)
+
+// This line mustn't go before any CC_IMPLEMENT_... macros
+#define new CAM_DEBUG_NEW
+
+
+/********************************************************************************************
+
+>	FramePropertiesParam::FramePropertiesParam()
+
+	Author:		Ranbir_Rana (Xara Group Ltd) <camelotdev@xxxxxxxx>
+	Created:	08/05/97
+	Scope:		public
+
+********************************************************************************************/
+
+FramePropertiesParam::FramePropertiesParam()
+{
+	m_FrameName = "";
+	m_FrameDelay = 50;
+	m_Overlay = FALSE;
+	m_Solid = FALSE;
+};
+
+
+
+
+/********************************************************************************************
+
+>	AnimPropertiesParam::AnimPropertiesParam()
+
+	Author:		Ranbir_Rana (Xara Group Ltd) <camelotdev@xxxxxxxx>
+	Created:	08/05/97
+	Scope:		public
+
+********************************************************************************************/
+
+AnimPropertiesParam::AnimPropertiesParam()
+{
+	m_Animloop			=	0;
+	m_GlobalAnimDelay	=	50;
+	m_Dither			=	XARADITHER_NONE;
+	m_Palette			=	PAL_GLOBAL;
+	m_PaletteColours	=	PALCOL_OPTIMIZED;
+	m_NumColsInPalette	=	256;
+	m_UseSystemColours	=	FALSE;
+	m_BackGroundIsTransp =  FALSE;
+};
+
+
+
+
+/********************************************************************************************
+
+>	AnimPropertiesParam& AnimPropertiesParam::operator=(const AnimPropertiesParam& obj)
+
+	Author:		Ranbir_Rana (Xara Group Ltd) <camelotdev@xxxxxxxx>
+	Created:	08/05/97
+	Scope:		public
+
+********************************************************************************************/
+
+AnimPropertiesParam& AnimPropertiesParam::operator=(const AnimPropertiesParam& obj)
+{
+	if (this == &obj)	return *this;
+
+	m_Animloop			=	obj.m_Animloop;
+	m_GlobalAnimDelay	=	obj.m_GlobalAnimDelay;
+	m_Dither			=	obj.m_Dither;
+	m_Palette			=	obj.m_Palette;
+	m_PaletteColours	=	obj.m_PaletteColours;
+	m_NumColsInPalette	=	obj.m_NumColsInPalette;
+	m_UseSystemColours	=	obj.m_UseSystemColours;
+
+	m_BoundingRect		=	obj.m_BoundingRect;
+
+	return *this;
+};
+
+
+
+
Index: Trunk/XaraLX/Kernel/webparam.cpp
===================================================================
--- Trunk/XaraLX/Kernel/webparam.cpp	(revision 0)
+++ Trunk/XaraLX/Kernel/webparam.cpp	(revision 808)
@@ -0,0 +1,145 @@
+// $Id: webparam.cpp 751 2006-03-31 15:43:49Z alex $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) 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.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+
+#include "camtypes.h"
+#include "webparam.h"
+
+// This is not compulsory, but you may as well put it in so that the correct version
+// of your file can be registered in the .exe
+DECLARE_SOURCE("$Revision: 751 $");
+
+// An implement to match the Declare in the .h file.
+// If you have many classes, it is recommended to place them all together, here at the start of the file
+CC_IMPLEMENT_MEMDUMP	( WebPrefsDlgParam,	OpParam )
+
+// This will get Camelot to display the filename and linenumber of any memory allocations
+// that are not released at program exit
+#define new CAM_DEBUG_NEW
+
+/******************************************************************************************
+
+>	WebPrefsDlgParam::WebPrefsDlgParam()
+
+	Author:		Phil_Martin (Xara Group Ltd) <camelotdev@xxxxxxxx>
+	Created:	07/04/2006
+	Inputs:		-
+	Outputs:	-
+	Returns:	-
+	Purpose:	WebPrefsDlgParam constructor
+	Errors:		-
+	Notes:		Seems that GCC needs to have at least one non-inline function or
+				else it gets confused.
+
+******************************************************************************************/
+
+WebPrefsDlgParam::WebPrefsDlgParam()
+{
+	ViewportSel				= DRAWING;
+	ExportSel				= DRAWING;
+	BmpCompression			= 100;
+	Compression				= TRUE;
+	ExportPreviewBitmap		= FALSE;
+	ConvertTextToOutlines	= TRUE;
+	WebOk					= FALSE;
+	HTMLToClipboard			= FALSE;
+	ConvertBlendsToOutlines	= FALSE;
+};
+
+
+
+
Index: Trunk/XaraLX/Kernel/jpglib_namespace.h
===================================================================
--- Trunk/XaraLX/Kernel/jpglib_namespace.h	(revision 0)
+++ Trunk/XaraLX/Kernel/jpglib_namespace.h	(revision 808)
@@ -0,0 +1,120 @@
+// $Id$
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) 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.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+//
+
+#ifndef INC_INCJPGLIB
+#define INC_INCJPGLIB
+
+#if defined(__WXMSW__)
+#define HAVE_BOOLEAN
+namespace libJPEG
+{
+	typedef ::boolean	boolean;
+}
+#endif
+
+// NB We assume jpeglib.h will test __cplusplus and use C naming as required
+namespace libJPEG
+{
+//	extern "C"
+//	{
+	#include "jpeglib.h"
+//	}
+};
+
+#endif	// INC_INCJPGLIB
Index: Trunk/XaraLX/Kernel/filter_types.h
===================================================================
--- Trunk/XaraLX/Kernel/filter_types.h	(revision 0)
+++ Trunk/XaraLX/Kernel/filter_types.h	(revision 808)
@@ -0,0 +1,202 @@
+// $Id: filter_types.h 740 2006-03-29 17:40:18Z alex $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) 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.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+
+// kernel class to encompass bitmaps
+
+#ifndef	INC_FILTERTYPES
+#define	INC_FILTERTYPES
+
+/*********************************************************************************************
+
+>	enum 		FILTERID
+
+	Author:		Phil_Martin (Xara Group Ltd) <camelotdev@xxxxxxxx>
+	Created:	31/3/2006
+	Purpose:	Enumerate different types of filter
+
+**********************************************************************************************/ 
+
+typedef enum FILTERID
+{
+	INVALID = -1,
+
+	TIFF_UNCOMPRESSED =	0,
+	BMP_UNCOMPRESSED,
+	PCX,
+	TARGA,
+	GIF,
+	WPG,
+	WMF,
+	TIFF_HUFFMAN,
+	TIFF_G3_FAX,
+	TIFF_LZW,
+	TIFF_G4_FAX,
+	DCX,
+	BMP_COMPRESSED,
+	JPEG,
+	EPS,
+	PICT,
+	TIFF_PACK,
+	TIFF_2D,
+	CALS,
+	LASER_DATA,
+	XBM,
+	MACPAINT,
+	GX2,
+	KOFAX,
+	IOCA,
+	ICON,
+	IFF_ILBM,
+	CLIP,
+	IMG,
+	BROOK_TROUT,
+	MSP,
+	CUT,
+	TARGA16,
+	CCITT_G3,
+	CCITT_G4,
+	XPM,
+	XWD,
+	RAST,
+	ASCII,
+	PHOTOCD,
+	TIFF_JPEG,
+	PHOTOSHOP,
+	IMNET,
+	PNG,
+	GIF_INTERLACED,
+	XEROX_EPS,
+	TIFF_ABIC,
+	TIFF_ABIC_BW,
+	DIB,
+	MODCA_IOCA,
+						UNDEFINED50,
+	TIFF_G4_FAX_FO,
+	CCITT_G4_FO,
+	CCITT_G3_FO,
+	FLASH_PIX,
+	IFF_5,
+	DICOM,
+	PCL_1,
+	WINFAX,
+
+	PDF,
+	SCITEX,
+	MAG,
+	DCS,
+	EPS_BITMAP,
+	EPS_BITMAP_G4,
+	NCR,
+	TI_GIF,
+	TI_GIF_INTERLACED,
+	TI_GIF_TRANSPARENT,
+	TI_GIF_TRANSINTER,
+	TI_GIF_ANIM,
+	MAKE_BITMAP_FILTER,
+	PNG_INTERLACED,
+	PNG_TRANSPARENT,
+	PNG_TRANSINTER,
+
+	// --- Insert new Filter Types just above here ---
+
+	MAXFILTERS
+} FilterType;
+
+
+
+#endif
Index: Trunk/XaraLX/Kernel/animparams.h
===================================================================
--- Trunk/XaraLX/Kernel/animparams.h	(revision 0)
+++ Trunk/XaraLX/Kernel/animparams.h	(revision 808)
@@ -0,0 +1,205 @@
+// $Id: animparams.h 793 2006-04-10 09:36:42Z alex $
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+================================XARAHEADERSTART===========================
+ 
+               Xara LX, a vector drawing and manipulation program.
+                    Copyright (C) 1993-2006 Xara Group Ltd.
+       Copyright on certain contributions may be held in joint with their
+              respective authors. See AUTHORS file for details.
+
+LICENSE TO USE AND MODIFY SOFTWARE
+----------------------------------
+
+This file is part of Xara LX.
+
+Xara LX is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published
+by the Free Software Foundation.
+
+Xara LX and its component source files are distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with Xara LX (see the file GPL in the root directory of the
+distribution); if not, write to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+ADDITIONAL RIGHTS
+-----------------
+
+Conditional upon your continuing compliance with the GNU General Public
+License described above, Xara Group Ltd grants to you certain additional
+rights. 
+
+The additional rights are to use, modify, and distribute the software
+together with the wxWidgets library, the wxXtra library, and the "CDraw"
+library and any other such library that any version of Xara LX relased
+by Xara Group Ltd requires in order to compile and execute, including
+the static linking of that library to XaraLX. In the case of the
+"CDraw" library, you may satisfy obligation under the GNU General Public
+License to provide source code by providing a binary copy of the library
+concerned and a copy of the license accompanying it.
+
+Nothing in this section restricts any of the rights you have under
+the GNU General Public License.
+
+
+SCOPE OF LICENSE
+----------------
+
+This license applies to this program (XaraLX) 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.
+
+This license does not apply to files in the wxXtra directory, which
+are built into a separate library, and are subject to the wxWindows
+license contained within that directory in the file "WXXTRA-LICENSE".
+
+This license does not apply to the binary libraries (if any) within
+the "libs" directory, which are subject to a separate license contained
+within that directory in the file "LIBS-LICENSE".
+
+
+ARRANGEMENTS FOR CONTRIBUTION OF MODIFICATIONS
+----------------------------------------------
+
+Subject to the terms of the GNU Public License (see above), you are
+free to do whatever you like with your modifications. However, you may
+(at your option) wish contribute them to Xara's source tree. You can
+find details of how to do this at:
+  http://www.xaraxtreme.org/developers/
+
+Prior to contributing your modifications, you will need to complete our
+contributor agreement. This can be found at:
+  http://www.xaraxtreme.org/developers/contribute/
+
+Please note that Xara will not accept modifications which modify any of
+the text between the start and end of this header (marked
+XARAHEADERSTART and XARAHEADEREND).
+
+
+MARKS
+-----
+
+Xara, Xara LX, Xara X, Xara X/Xtreme, Xara Xtreme, the Xtreme and Xara
+designs are registered or unregistered trademarks, design-marks, and/or
+service marks of Xara Group Ltd. All rights in these marks are reserved.
+
+
+      Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+                        http://www.xara.com/
+
+=================================XARAHEADEREND============================
+ */
+
+#ifndef INC_ANIMPARAMS
+#define INC_ANIMPARAMS
+
+#include "ops.h"
+#include "paldefs.h"
+
+/*******************************************************************************************************
+
+  class FramePropertiesParam : publc OpParam
+
+  Author:	Ranbir_Rana (Xara Group Ltd) <camelotdev@xxxxxxxx>
+  Created:	30/04/97
+  Purpose:	Allows the transfer of data from our Frame Gallery to our current layer object.
+				
+********************************************************************************************************/
+
+class FramePropertiesParam: public OpParam
+{
+
+//	CC_DECLARE_DYNAMIC(FramePropertiesParam)
+
+public:
+	FramePropertiesParam();
+
+	String_256& GetFrameName()								{ return m_FrameName;	};
+	void		SetFrameName(const String_256& Name)		{ m_FrameName = Name;	};
+	UINT32		GetAnimDelay () const						{ return m_FrameDelay;	};
+	void		SetAnimDelay(const UINT32& Delay)			{ m_FrameDelay = Delay; };
+	BOOL		GetOverlay()								{ return m_Overlay;		};
+	void		SetOverlay (const BOOL& Val)				{ m_Overlay = Val;		};
+	BOOL		GetSolid()									{ return m_Solid;		};
+	void		SetSolid (const BOOL& Val)					{ m_Solid = Val;		};
+
+protected:
+	String_256 m_FrameName;				// Name of the selected bitmap.
+	UINT32	   m_FrameDelay;			// Delay between frames for Animations.
+	BOOL m_Overlay;						// Set if the previous layer is said to overlay the
+										//	previous one rathar than  obscure it.
+	BOOL m_Solid;						// A solid frame/layer is like a background layer in
+										// that it forms the background for frames above it.
+};
+
+
+/*******************************************************************************************************
+
+  class AnimPropertiesParam : publc OpParam
+
+  Author:	Ranbir_Rana (Xara Group Ltd) <camelotdev@xxxxxxxx>
+  Created:	30/04/97
+  Purpose:	Allows the transfer of data from our Frame Gallery to a current spread object.
+				
+********************************************************************************************************/
+class AnimPropertiesParam: public OpParam
+{
+	CC_DECLARE_DYNAMIC(AnimPropertiesParam)
+
+public:
+	AnimPropertiesParam();
+
+	DWORD			GetAnimLoop()const							{ return m_Animloop;			};
+	void			SetAnimLoop(const DWORD& Loop)				{ m_Animloop = Loop;			};
+	DWORD			GetGlobalAnimDelay() const					{ return m_GlobalAnimDelay;		};
+	void			SetGlobalanimDelay(const DWORD& Delay)		{ m_GlobalAnimDelay = Delay;	};
+	DITHER			GetDither()const							{ return m_Dither;				};
+	void			SetDither(const DITHER& dither)				{ m_Dither = dither;			};
+	WEB_PALETTE		GetPalette() const							{ return m_Palette;				};
+	void			SetPalette(const WEB_PALETTE& Palette)		{ m_Palette = Palette;			};
+	DWORD			GetNumColsInPalette() const					{ return m_NumColsInPalette;	};
+	void			SetNumColsInPalette(const DWORD& num)		{ m_NumColsInPalette = num;		};
+	PALETTE_COLOURS	GetPaletteCols() const						{ return m_PaletteColours;		};
+	void			SetPaletteCols(const PALETTE_COLOURS& Pal)	{ m_PaletteColours = Pal;		};
+	BOOL 			GetUseSystemCols() const					{ return m_UseSystemColours;	};
+	void			SetUseSystemCols(const BOOL &Val)			{ m_UseSystemColours = Val;		};
+	BOOL 			GetIsBackGroundTransp() const				{ return m_BackGroundIsTransp;	};
+	void			SetIsBackGroundTransp(const BOOL &Val)		{ m_BackGroundIsTransp = Val;	};
+
+	AnimPropertiesParam& operator=(const AnimPropertiesParam& obj);
+
+protected:
+
+	DWORD			m_Animloop;	
+	DWORD		 	m_GlobalAnimDelay; 		
+	DITHER			m_Dither;				// Dither type
+	WEB_PALETTE		m_Palette;				// Global\Local
+	PALETTE_COLOURS m_PaletteColours;		// Browser\Optimised
+	DWORD			m_NumColsInPalette;
+	BOOL			m_UseSystemColours;
+	BOOL			m_BackGroundIsTransp;
+
+public:
+	// Stores and gives access to the bounding rectangle of the export
+	// If this changes then we will need to regenerate all frames
+	void			SetBoundingRect(const DocRect& BoundingRect)	{ m_BoundingRect = BoundingRect; };
+	DocRect			GetBoundingRect() const							{ return m_BoundingRect;		};
+	
+	// Stores and gives access to the capture quality of the export
+	// If this changes then we will need to regenerate all frames
+	void			SetAnimationQuality(const Quality& NewQuality)	{ m_Quality = NewQuality; };
+	Quality			GetAnimationQuality() const						{ return m_Quality;		};
+
+protected:
+	DocRect			m_BoundingRect;
+	Quality			m_Quality;
+};
+
+#endif	// INC_ANIMPARAMS
+


Xara