[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1080
Date : Tue May 16 14:24:47 BST 2006
Changed paths:
M /Trunk/XaraLX/Scripts/build-resources.sh
M /Trunk/XaraLX/wxOil/bfxalu.cpp
M /Trunk/XaraLX/wxOil/bfxalu.h
M /Trunk/XaraLX/wxOil/bfxpixop.cpp
M /Trunk/XaraLX/wxOil/bfxpixop.h
M /Trunk/XaraLX/wxOil/binreloc.h
M /Trunk/XaraLX/wxOil/camplatform.cpp
M /Trunk/XaraLX/wxOil/camplatform.h
M /Trunk/XaraLX/wxOil/camprocess.cpp
M /Trunk/XaraLX/wxOil/camprocess.h
M /Trunk/XaraLX/wxOil/customlist.cpp
M /Trunk/XaraLX/wxOil/customlist.h
M /Trunk/XaraLX/wxOil/dropdown.cpp
M /Trunk/XaraLX/wxOil/dropdown.h
M /Trunk/XaraLX/wxOil/ktimer.cpp
M /Trunk/XaraLX/wxOil/ktimer.h
M /Trunk/XaraLX/wxOil/xmlutils.cpp
M /Trunk/XaraLX/wxOil/xmlutils.h
M /Trunk/XaraLX/wxOil/xrc/EN/statusbar.xrc
M /Trunk/XaraLX/wxXtra/combo.cpp
M /Trunk/XaraLX/wxXtra/combo.h
M /Trunk/XaraLX/wxXtra/combog.cpp
M /Trunk/XaraLX/wxXtra/combog.h
M /Trunk/XaraLX/wxXtra/odcombo.cpp
M /Trunk/XaraLX/wxXtra/odcombo.h
M /Trunk/XaraLX/wxXtra/platform.cpp
M /Trunk/XaraLX/wxXtra/platform.h
M /Trunk/XaraLX/xarlib/camelot.cpp
M /Trunk/XaraLX/xarlib/camelot.h
M /Trunk/XaraLX/xarlib/ensure.cpp
M /Trunk/XaraLX/xarlib/ensure.h
M /Trunk/XaraLX/xarlib/xarlib.cpp
M /Trunk/XaraLX/xarlib/xarlib.h
Fixed properties on various files
Diff:
Index: Trunk/XaraLX/xarlib/ensure.cpp
===================================================================
--- Trunk/XaraLX/xarlib/ensure.cpp (revision 1079)
+++ Trunk/XaraLX/xarlib/ensure.cpp (revision 1080)
@@ -1,66 +1,66 @@
-// $Header: /Camelot/winoil/ensure.cpp 24 7/08/96 21:30 Richard $
-
-/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
-============================XARAHEADERSTART================================
- Xara X/Xtreme, a vector drawing and manipulation program.
- Copyright (C) 2005 Xara Group Ltd.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is 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
-this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Users wishing to use this library in proprietary products which are not
-themselves to be released under the GNU Public License should contact Xara for
-a license to do so. Such a license will normally be granted free of charge.
-
- Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
- http://www.xara.com/
-
-===========================XARAHEADEREND===================================*/
-
-#include "camtypes.h"
-
-// NOTE: in separate module so it can replaced if needed.
-
-#ifdef _ENSURES
-int AssertBusy = FALSE; // for testing diagnostics
-#endif
-
-
-/***********************************************************************************************
-
-> void EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine)
-
- Author: Simon M
- Created: 3/5/93
- Inputs: AssertDescription: Reason for failure description
- lpszFileName: Filename of file that caused failure
- nLine: Line number that caused failure
- Outputs: -
- Returns: -
- Purpose: This function should only ever be invoked from the ENSURE macro
- which is similar to the ASSERT macro, the only difference being that
- it takes a parameter which describes the reason for the failure.
- Errors: -
- SeeAlso: -
-
-***********************************************************************************************/
-/* Technical notes:
-
-This function is an almost direct copy of the AfxAssertFailedLine function which is
-called from the ASSERT macro.
-*/
-
-void EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine)
-{
- TRACE(_T("Ensure failed at %s (%d): %s
"), lpszFileName, nLine, AssertDescription);
-}
+// $Header: /Camelot/winoil/ensure.cpp 24 7/08/96 21:30 Richard $
+
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+============================XARAHEADERSTART================================
+ Xara X/Xtreme, a vector drawing and manipulation program.
+ Copyright (C) 2005 Xara Group Ltd.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is 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
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Users wishing to use this library in proprietary products which are not
+themselves to be released under the GNU Public License should contact Xara for
+a license to do so. Such a license will normally be granted free of charge.
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+===========================XARAHEADEREND===================================*/
+
+#include "camtypes.h"
+
+// NOTE: in separate module so it can replaced if needed.
+
+#ifdef _ENSURES
+int AssertBusy = FALSE; // for testing diagnostics
+#endif
+
+
+/***********************************************************************************************
+
+> void EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine)
+
+ Author: Simon M
+ Created: 3/5/93
+ Inputs: AssertDescription: Reason for failure description
+ lpszFileName: Filename of file that caused failure
+ nLine: Line number that caused failure
+ Outputs: -
+ Returns: -
+ Purpose: This function should only ever be invoked from the ENSURE macro
+ which is similar to the ASSERT macro, the only difference being that
+ it takes a parameter which describes the reason for the failure.
+ Errors: -
+ SeeAlso: -
+
+***********************************************************************************************/
+/* Technical notes:
+
+This function is an almost direct copy of the AfxAssertFailedLine function which is
+called from the ASSERT macro.
+*/
+
+void EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine)
+{
+ TRACE(_T("Ensure failed at %s (%d): %s
"), lpszFileName, nLine, AssertDescription);
+}
Property changes on: Trunk/XaraLX/xarlib/ensure.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: Trunk/XaraLX/xarlib/xarlib.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Index: Trunk/XaraLX/xarlib/camelot.cpp
===================================================================
--- Trunk/XaraLX/xarlib/camelot.cpp (revision 1079)
+++ Trunk/XaraLX/xarlib/camelot.cpp (revision 1080)
@@ -1,66 +1,66 @@
-// camelot.cpp : Defines the class behaviors for the application.
-
-/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
-============================XARAHEADERSTART================================
- Xara X/Xtreme, a vector drawing and manipulation program.
- Copyright (C) 2005 Xara Group Ltd.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is 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
-this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Users wishing to use this library in proprietary products which are not
-themselves to be released under the GNU Public License should contact Xara for
-a license to do so. Such a license will normally be granted free of charge.
-
- Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
- http://www.xara.com/
-
-===========================XARAHEADEREND===================================*/
-
-#include "camtypes.h"
-#include "camelot.h"
-
-/********************************************************************************************
-
-> BOOL InitFlareLibrary()
-
- Author: Gerry
- Created: 17/08/2004
- Inputs:
- Returns: TRUE if successfull, FALSE if failed.
- Purpose: Initialises the library
-
-********************************************************************************************/
-
-BOOL InitFlareLibrary()
-{
- return(TRUE);
-}
-
-
-
-/********************************************************************************************
-
-> BOOL ExitFlareLibrary()
-
- Author: Gerry
- Created: 17/08/2004
- Inputs:
- Returns: TRUE if succesful, FALSE otherwise (not that you can do much about it)
-
-********************************************************************************************/
-
-BOOL ExitFlareLibrary()
-{
- return(TRUE);
-}
+// camelot.cpp : Defines the class behaviors for the application.
+
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+============================XARAHEADERSTART================================
+ Xara X/Xtreme, a vector drawing and manipulation program.
+ Copyright (C) 2005 Xara Group Ltd.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is 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
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Users wishing to use this library in proprietary products which are not
+themselves to be released under the GNU Public License should contact Xara for
+a license to do so. Such a license will normally be granted free of charge.
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+===========================XARAHEADEREND===================================*/
+
+#include "camtypes.h"
+#include "camelot.h"
+
+/********************************************************************************************
+
+> BOOL InitFlareLibrary()
+
+ Author: Gerry
+ Created: 17/08/2004
+ Inputs:
+ Returns: TRUE if successfull, FALSE if failed.
+ Purpose: Initialises the library
+
+********************************************************************************************/
+
+BOOL InitFlareLibrary()
+{
+ return(TRUE);
+}
+
+
+
+/********************************************************************************************
+
+> BOOL ExitFlareLibrary()
+
+ Author: Gerry
+ Created: 17/08/2004
+ Inputs:
+ Returns: TRUE if succesful, FALSE otherwise (not that you can do much about it)
+
+********************************************************************************************/
+
+BOOL ExitFlareLibrary()
+{
+ return(TRUE);
+}
Property changes on: Trunk/XaraLX/xarlib/camelot.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/xarlib/ensure.h
===================================================================
--- Trunk/XaraLX/xarlib/ensure.h (revision 1079)
+++ Trunk/XaraLX/xarlib/ensure.h (revision 1080)
@@ -1,72 +1,72 @@
-/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
-============================XARAHEADERSTART================================
- Xara X/Xtreme, a vector drawing and manipulation program.
- Copyright (C) 2005 Xara Group Ltd.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is 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
-this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Users wishing to use this library in proprietary products which are not
-themselves to be released under the GNU Public License should contact Xara for
-a license to do so. Such a license will normally be granted free of charge.
-
- Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
- http://www.xara.com/
-
-===========================XARAHEADEREND===================================*/
-
-/***********************************************************************************************
-
-> #define ENSURE(expr,description)
-
- Author: Simon M
- Created: 3/5/93
- Inputs: expr: Expression to test
- description: Description of why failure occured.
- If NULL is specified then then no description field
- will be displayed in the message box.
-
- Returns: -
- Purpose: This macro is similar to the ASSERT macro, the only difference
- being that a description is provided of why the failure occured.
- The symbol _ENSURES is defined if the ENSURE macro expands to something,
- else is undefined if the ENSURE macro has no effect. IMPORTANT NOTE:
- ENSURE is obsolete. Use ERROR2xx or ERROR3xx macros instead.
- Errors: -
- SeeAlso: -
-
-***********************************************************************************************/
-
-#ifndef INC_ENSURE
-#define INC_ENSURE
-
- void CCAPI EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine);
-
-// Set this #define to build ensures into retail builds too
-//#define _INCLUDE_ENSURES_IN_RETAIL
-
- #ifdef _DEBUG
- // Debug ensure
- #define ENSURE(expr,description) ((expr) ? (void)0: EnsureFailedLine(description,__FILE__,__LINE__))
- #define _ENSURES
- #else
- #ifdef _INCLUDE_ENSURES_IN_RETAIL
- // Retail ensures same as debug ensures at the moment
- #define ENSURE(expr,description) ((expr) ? (void)0: EnsureFailedLine(NULL,__FILE__,__LINE__))
- #define _ENSURES
- #else
- // Ensure that evaluates to nothing
- #define ENSURE(expr,description) ((void)0)
- #endif
- #endif
-#endif
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+============================XARAHEADERSTART================================
+ Xara X/Xtreme, a vector drawing and manipulation program.
+ Copyright (C) 2005 Xara Group Ltd.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is 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
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Users wishing to use this library in proprietary products which are not
+themselves to be released under the GNU Public License should contact Xara for
+a license to do so. Such a license will normally be granted free of charge.
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+===========================XARAHEADEREND===================================*/
+
+/***********************************************************************************************
+
+> #define ENSURE(expr,description)
+
+ Author: Simon M
+ Created: 3/5/93
+ Inputs: expr: Expression to test
+ description: Description of why failure occured.
+ If NULL is specified then then no description field
+ will be displayed in the message box.
+
+ Returns: -
+ Purpose: This macro is similar to the ASSERT macro, the only difference
+ being that a description is provided of why the failure occured.
+ The symbol _ENSURES is defined if the ENSURE macro expands to something,
+ else is undefined if the ENSURE macro has no effect. IMPORTANT NOTE:
+ ENSURE is obsolete. Use ERROR2xx or ERROR3xx macros instead.
+ Errors: -
+ SeeAlso: -
+
+***********************************************************************************************/
+
+#ifndef INC_ENSURE
+#define INC_ENSURE
+
+ void CCAPI EnsureFailedLine(LPCSTR AssertDescription, LPCSTR lpszFileName, int nLine);
+
+// Set this #define to build ensures into retail builds too
+//#define _INCLUDE_ENSURES_IN_RETAIL
+
+ #ifdef _DEBUG
+ // Debug ensure
+ #define ENSURE(expr,description) ((expr) ? (void)0: EnsureFailedLine(description,__FILE__,__LINE__))
+ #define _ENSURES
+ #else
+ #ifdef _INCLUDE_ENSURES_IN_RETAIL
+ // Retail ensures same as debug ensures at the moment
+ #define ENSURE(expr,description) ((expr) ? (void)0: EnsureFailedLine(NULL,__FILE__,__LINE__))
+ #define _ENSURES
+ #else
+ // Ensure that evaluates to nothing
+ #define ENSURE(expr,description) ((void)0)
+ #endif
+ #endif
+#endif
Property changes on: Trunk/XaraLX/xarlib/ensure.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/xarlib/xarlib.h
===================================================================
--- Trunk/XaraLX/xarlib/xarlib.h (revision 1079)
+++ Trunk/XaraLX/xarlib/xarlib.h (revision 1080)
@@ -1,76 +1,76 @@
-/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
-============================XARAHEADERSTART================================
- Xara X/Xtreme, a vector drawing and manipulation program.
- Copyright (C) 2005 Xara Group Ltd.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is 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
-this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Users wishing to use this library in proprietary products which are not
-themselves to be released under the GNU Public License should contact Xara for
-a license to do so. Such a license will normally be granted free of charge.
-
- Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
- http://www.xara.com/
-
-===========================XARAHEADEREND===================================*/
-
-#ifndef INC_XARLIB
-#define INC_XARLIB
-
-#include "cxftags.h"
-#include "cxfrec.h"
-
-class CXaraFileRecord;
-class CXaraFile;
-class CCDiskFile;
-class CCMemFile;
-
-typedef HRESULT (RecordHandler)(void*, CXaraFileRecord*);
-
-class CXarImport
-{
-public:
- virtual ~CXarImport() {};
- virtual BOOL PrepareImport() = 0;
- virtual BOOL PrepareImport(char* pFileName) = 0;
-#if defined(USE_COM_STREAM)
- virtual BOOL PrepareImport(IStream* pStream) = 0;
-#endif // defined(USE_COM_STREAM)
- virtual BOOL PrepareImport(BYTE* pBuffer, UINT32 Size) = 0;
- virtual BOOL SetHandler(void* pMagic, RecordHandler* pHandlerFunk) = 0;
- virtual BOOL DoImport() = 0;
-};
-
-class CXarExport
-{
-public:
- virtual ~CXarExport() {};
- virtual BOOL StartExport() = 0;
- virtual BOOL StartExport(char* pFileName) = 0;
-#if defined(USE_COM_STREAM)
- virtual BOOL StartExport(IStream* pStream) = 0;
-#endif // defined(USE_COM_STREAM)
- virtual BOOL StartBufferedExport() = 0;
- virtual BOOL WriteRecord(CXaraFileRecord* pRecord, UINT32* pRecordNum = NULL) = 0;
- virtual BOOL WriteZeroSizedRecord(UINT32 Tag, UINT32* pRecordNum = NULL) = 0;
- virtual BOOL GetExportBuffer(BYTE** ppBuffer, UINT32* pSize) = 0;
-};
-
-namespace XarLibrary
-{
- CXarImport* CreateImporter();
- CXarExport* CreateExporter();
-}
-
-#endif
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+============================XARAHEADERSTART================================
+ Xara X/Xtreme, a vector drawing and manipulation program.
+ Copyright (C) 2005 Xara Group Ltd.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is 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
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Users wishing to use this library in proprietary products which are not
+themselves to be released under the GNU Public License should contact Xara for
+a license to do so. Such a license will normally be granted free of charge.
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+===========================XARAHEADEREND===================================*/
+
+#ifndef INC_XARLIB
+#define INC_XARLIB
+
+#include "cxftags.h"
+#include "cxfrec.h"
+
+class CXaraFileRecord;
+class CXaraFile;
+class CCDiskFile;
+class CCMemFile;
+
+typedef HRESULT (RecordHandler)(void*, CXaraFileRecord*);
+
+class CXarImport
+{
+public:
+ virtual ~CXarImport() {};
+ virtual BOOL PrepareImport() = 0;
+ virtual BOOL PrepareImport(char* pFileName) = 0;
+#if defined(USE_COM_STREAM)
+ virtual BOOL PrepareImport(IStream* pStream) = 0;
+#endif // defined(USE_COM_STREAM)
+ virtual BOOL PrepareImport(BYTE* pBuffer, UINT32 Size) = 0;
+ virtual BOOL SetHandler(void* pMagic, RecordHandler* pHandlerFunk) = 0;
+ virtual BOOL DoImport() = 0;
+};
+
+class CXarExport
+{
+public:
+ virtual ~CXarExport() {};
+ virtual BOOL StartExport() = 0;
+ virtual BOOL StartExport(char* pFileName) = 0;
+#if defined(USE_COM_STREAM)
+ virtual BOOL StartExport(IStream* pStream) = 0;
+#endif // defined(USE_COM_STREAM)
+ virtual BOOL StartBufferedExport() = 0;
+ virtual BOOL WriteRecord(CXaraFileRecord* pRecord, UINT32* pRecordNum = NULL) = 0;
+ virtual BOOL WriteZeroSizedRecord(UINT32 Tag, UINT32* pRecordNum = NULL) = 0;
+ virtual BOOL GetExportBuffer(BYTE** ppBuffer, UINT32* pSize) = 0;
+};
+
+namespace XarLibrary
+{
+ CXarImport* CreateImporter();
+ CXarExport* CreateExporter();
+}
+
+#endif
Property changes on: Trunk/XaraLX/xarlib/xarlib.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/xarlib/camelot.h
===================================================================
--- Trunk/XaraLX/xarlib/camelot.h (revision 1079)
+++ Trunk/XaraLX/xarlib/camelot.h (revision 1080)
@@ -1,35 +1,35 @@
-/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
-============================XARAHEADERSTART================================
- Xara X/Xtreme, a vector drawing and manipulation program.
- Copyright (C) 2005 Xara Group Ltd.
-
-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program is 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
-this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Users wishing to use this library in proprietary products which are not
-themselves to be released under the GNU Public License should contact Xara for
-a license to do so. Such a license will normally be granted free of charge.
-
- Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
- http://www.xara.com/
-
-===========================XARAHEADEREND===================================*/
-
-// camelot.h : main header file for the CAMELOT application
-
-#ifndef INC_CAMELOT
-#define INC_CAMELOT
-
-// What, nothing in here at all...?
-
-#endif // !INC_CAMELOT
+/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
+============================XARAHEADERSTART================================
+ Xara X/Xtreme, a vector drawing and manipulation program.
+ Copyright (C) 2005 Xara Group Ltd.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is 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
+this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+Users wishing to use this library in proprietary products which are not
+themselves to be released under the GNU Public License should contact Xara for
+a license to do so. Such a license will normally be granted free of charge.
+
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
+
+===========================XARAHEADEREND===================================*/
+
+// camelot.h : main header file for the CAMELOT application
+
+#ifndef INC_CAMELOT
+#define INC_CAMELOT
+
+// What, nothing in here at all...?
+
+#endif // !INC_CAMELOT
Property changes on: Trunk/XaraLX/xarlib/camelot.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: Trunk/XaraLX/Scripts/build-resources.sh
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/combo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combo.cpp (revision 1079)
+++ Trunk/XaraLX/wxXtra/combo.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/combo.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/combo.h
===================================================================
--- Trunk/XaraLX/wxXtra/combo.h (revision 1079)
+++ Trunk/XaraLX/wxXtra/combo.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/combo.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/combog.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combog.cpp (revision 1079)
+++ Trunk/XaraLX/wxXtra/combog.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/combog.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/combog.h
===================================================================
--- Trunk/XaraLX/wxXtra/combog.h (revision 1079)
+++ Trunk/XaraLX/wxXtra/combog.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/combog.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/odcombo.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1079)
+++ Trunk/XaraLX/wxXtra/odcombo.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/odcombo.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/platform.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/platform.cpp (revision 1079)
+++ Trunk/XaraLX/wxXtra/platform.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxmousestate.cpp 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/platform.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/odcombo.h
===================================================================
--- Trunk/XaraLX/wxXtra/odcombo.h (revision 1079)
+++ Trunk/XaraLX/wxXtra/odcombo.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: odcombo.h 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/odcombo.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxXtra/platform.h
===================================================================
--- Trunk/XaraLX/wxXtra/platform.h (revision 1079)
+++ Trunk/XaraLX/wxXtra/platform.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxmousestate.h 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn-tp@@ THIRD PARTY COPYRIGHT */
// The following line makes normalize.pl skip type fixing
/* SKIPFIXTYPES: START */
Property changes on: Trunk/XaraLX/wxXtra/platform.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/ktimer.h
===================================================================
--- Trunk/XaraLX/wxOil/ktimer.h (revision 1079)
+++ Trunk/XaraLX/wxOil/ktimer.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: ktimer.h 869 2006-04-24 14:03:18Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/ktimer.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/ktimer.cpp
===================================================================
--- Trunk/XaraLX/wxOil/ktimer.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/ktimer.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: cartctl.cpp 869 2006-04-24 14:03:18Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/ktimer.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/binreloc.h
===================================================================
--- Trunk/XaraLX/wxOil/binreloc.h (revision 1079)
+++ Trunk/XaraLX/wxOil/binreloc.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: basebar.h 836 2006-04-18 16:06:15Z gerry $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/binreloc.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/camplatform.h
===================================================================
--- Trunk/XaraLX/wxOil/camplatform.h (revision 1079)
+++ Trunk/XaraLX/wxOil/camplatform.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: camplatform.h 957 2006-05-05 09:03:18Z luke $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/camplatform.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/bfxpixop.h
===================================================================
--- Trunk/XaraLX/wxOil/bfxpixop.h (revision 1079)
+++ Trunk/XaraLX/wxOil/bfxpixop.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/bfxpixop.h, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/bfxpixop.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/customlist.cpp
===================================================================
--- Trunk/XaraLX/wxOil/customlist.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/customlist.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/CustomList.cpp, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/customlist.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/bfxalu.h
===================================================================
--- Trunk/XaraLX/wxOil/bfxalu.h (revision 1079)
+++ Trunk/XaraLX/wxOil/bfxalu.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/bfxalu.h, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/bfxalu.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/xmlutils.h
===================================================================
--- Trunk/XaraLX/wxOil/xmlutils.h (revision 1079)
+++ Trunk/XaraLX/wxOil/xmlutils.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: xmlutils.h 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/xmlutils.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/camplatform.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camplatform.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/camplatform.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: camplatform.cpp 957 2006-05-05 09:03:18Z luke $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/camplatform.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/camprocess.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/camprocess.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: xpoilflt.cpp 836 2006-04-18 16:06:15Z gerry $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/camprocess.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/bfxpixop.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bfxpixop.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/bfxpixop.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/bfxpixop.cpp, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -112,7 +112,7 @@
// 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: 3 $");
+DECLARE_SOURCE("$Revision$");
CC_IMPLEMENT_DYNCREATE(BfxPixelOp, CCObject)
CC_IMPLEMENT_DYNCREATE(BfxPixelOp32, BfxPixelOp)
Property changes on: Trunk/XaraLX/wxOil/bfxpixop.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/customlist.h
===================================================================
--- Trunk/XaraLX/wxOil/customlist.h (revision 1079)
+++ Trunk/XaraLX/wxOil/customlist.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/CustomList.h, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/customlist.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/dropdown.h
===================================================================
--- Trunk/XaraLX/wxOil/dropdown.h (revision 1079)
+++ Trunk/XaraLX/wxOil/dropdown.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/dropdown.h, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/dropdown.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Property changes on: Trunk/XaraLX/wxOil/xrc/EN/statusbar.xrc
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/camprocess.h
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.h (revision 1079)
+++ Trunk/XaraLX/wxOil/camprocess.h (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: xpoilflt.h 751 2006-03-31 15:43:49Z alex $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/camprocess.h
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/dropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dropdown.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/dropdown.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/dropdown.cpp, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/dropdown.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/bfxalu.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bfxalu.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/bfxalu.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: wxOil/bfxalu.cpp, 1, 01-Jan-2006, Anonymous $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
@@ -160,7 +160,7 @@
// 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: 4 $");
+DECLARE_SOURCE("$Revision$");
// 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
Property changes on: Trunk/XaraLX/wxOil/bfxalu.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Index: Trunk/XaraLX/wxOil/xmlutils.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xmlutils.cpp (revision 1079)
+++ Trunk/XaraLX/wxOil/xmlutils.cpp (revision 1080)
@@ -1,4 +1,4 @@
-// $Id: xmlutils.cpp 836 2006-04-18 16:06:15Z gerry $
+// $Id$
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Property changes on: Trunk/XaraLX/wxOil/xmlutils.cpp
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Xara