[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 793
Date : Mon Apr 10 10:36:43 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/layergal.h
A /Trunk/XaraLX/Kernel/paldefs.h
M /Trunk/XaraLX/Kernel/sgframe.h
M /Trunk/XaraLX/Kernel/sglayer.cpp
M /Trunk/XaraLX/Kernel/spread.h
Move a couple of include dependencies about to untangle things
Diff:
Index: Trunk/XaraLX/Kernel/spread.h
===================================================================
--- Trunk/XaraLX/Kernel/spread.h (revision 792)
+++ Trunk/XaraLX/Kernel/spread.h (revision 793)
@@ -105,9 +105,7 @@
#include "convert.h"
#include "grid.h"
#include "dibconv.h"
-//#ifdef _DEBUG
-//#include "sgframe.h"
-//#endif //debug
+#include "paldefs.h"
// NEW_PASTEBOARD compile switch
@@ -118,9 +116,6 @@
#define NEW_PASTEBOARD 0
-PORTNOTE("other","Define some sgframe stuuf")
-typedef INT32 WEB_PALETTE;
-typedef INT32 PALETTE_COLOURS;
/***********************************************************************************************
Index: Trunk/XaraLX/Kernel/sgframe.h
===================================================================
--- Trunk/XaraLX/Kernel/sgframe.h (revision 792)
+++ Trunk/XaraLX/Kernel/sgframe.h (revision 793)
@@ -111,23 +111,11 @@
#include "sglayer.h"
#include "bmpprefs.h" // For PALETTE Type
#include "quality.h"
+#include "paldefs.h"
class DocView;
class UndoableOperation;
-enum PALETTE_COLOURS
-{
- PALCOL_BROWSER,
- PALCOL_OPTIMIZED,
- PALCOL_STANDARD
-};
-
-enum WEB_PALETTE
-{
- PAL_GLOBAL,
- PAL_LOCAL
-};
-
#ifndef EXCLUDE_GALS
/***********************************************************************************************
Index: Trunk/XaraLX/Kernel/paldefs.h
===================================================================
--- Trunk/XaraLX/Kernel/paldefs.h (revision 0)
+++ Trunk/XaraLX/Kernel/paldefs.h (revision 793)
@@ -0,0 +1,121 @@
+// $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============================
+ */
+
+// SGFrame.h - the FrameSGallery (Frame SuperGallery) class
+// Looks remarkably like the layer gallery but looks aren't everything!
+
+
+#ifndef INC_PALDEFS
+#define INC_PALDEFS
+
+enum PALETTE_COLOURS
+{
+ PALCOL_BROWSER,
+ PALCOL_OPTIMIZED,
+ PALCOL_STANDARD
+};
+
+enum WEB_PALETTE
+{
+ PAL_GLOBAL,
+ PAL_LOCAL
+};
+
+
+#endif
+
Property changes on: Trunk/XaraLX/Kernel/paldefs.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/Kernel/sglayer.cpp
===================================================================
--- Trunk/XaraLX/Kernel/sglayer.cpp (revision 792)
+++ Trunk/XaraLX/Kernel/sglayer.cpp (revision 793)
@@ -144,7 +144,7 @@
#include "layermgr.h"
#include "helpuser.h"
-#include "xshelpid.h"
+//#include "xshelpid.h"
//#include "helppath.h"
void Beep();
Index: Trunk/XaraLX/Kernel/layergal.h
===================================================================
--- Trunk/XaraLX/Kernel/layergal.h (revision 792)
+++ Trunk/XaraLX/Kernel/layergal.h (revision 793)
@@ -213,11 +213,13 @@
//-------------
OpLayerGalParam(OpLayerGalReason ThisReason,Spread* pThisParentSpread)
- : Reason(ThisReason), pParentSpread(pThisParentSpread), pLayer(NULL),
- pContextNode(NULL), pLayerSGal(NULL), ToggleBackground(FALSE) { /* empty */ }
+ : pLayer(NULL), ToggleBackground(FALSE),
+ pContextNode(NULL), pLayerSGal(NULL),
+ Reason(ThisReason), pParentSpread(pThisParentSpread) { /* empty */ }
- OpLayerGalParam() : Reason(LAYER_NONE), pParentSpread(NULL), pLayer(NULL),
- pContextNode(NULL), pLayerSGal(NULL) { /* empty */ }
+ OpLayerGalParam() : pLayer(NULL), ToggleBackground(FALSE),
+ pContextNode(NULL), pLayerSGal(NULL),
+ Reason(LAYER_NONE), pParentSpread(NULL) { /* empty */ }
Spread* GetParentSpread() { return pParentSpread; }
OpLayerGalReason GetReason() { return Reason; }
Xara