[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1082
Date : Tue May 16 15:42:56 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/bmapprev.cpp
M /Trunk/XaraLX/Kernel/cxfile.cpp
M /Trunk/XaraLX/wxOil/binreloc.c
M /Trunk/XaraLX/wxOil/binreloc.h
M /Trunk/XaraLX/wxOil/camelot.cpp
M /Trunk/XaraLX/wxOil/camelot.h
M /Trunk/XaraLX/wxOil/camprocess.cpp
M /Trunk/XaraLX/wxOil/camprocess.h
M /Trunk/XaraLX/wxOil/customlist.cpp
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/dropdown.cpp
M /Trunk/XaraLX/wxOil/dropdown.h
M /Trunk/XaraLX/wxOil/xmlutils.cpp
M /Trunk/XaraLX/wxOil/xmlutils.h
M /Trunk/XaraLX/wxOil/xpoilflt.cpp
Fix normalise.pl type stuff
Diff:
Index: Trunk/XaraLX/Kernel/cxfile.cpp
===================================================================
--- Trunk/XaraLX/Kernel/cxfile.cpp (revision 1081)
+++ Trunk/XaraLX/Kernel/cxfile.cpp (revision 1082)
@@ -2048,7 +2048,7 @@
> virtual void CXaraFile::AddAtomicTag(AtomicTagListItem* pItem)
- Author: Markn
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 16/8/96
Inputs: pItem = ptr to an atomic list item
Returns: -
@@ -2072,7 +2072,7 @@
> virtual void CXaraFile::AddEssentialTag(EssentialTagListItem* pItem)
- Author: Markn
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 16/8/96
Inputs: pItem = ptr to an Essential list item
Returns: -
@@ -2096,7 +2096,7 @@
> BOOL CXaraFile::WriteRemainingAtomicTagDefinitions ()
- Author: Chris Snook
+ Author: Chris_Snook (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 14/9/2000
Inputs: -
Outputs: -
@@ -2132,7 +2132,7 @@
> virtual BOOL CXaraFile::IsTagInAtomicList(UINT32 Tag)
- Author: Markn
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 16/8/96
Inputs: Tag = tag value to look for
Returns: TRUE if found, FALSE otherwsie
@@ -2164,7 +2164,7 @@
> virtual BOOL CXaraFile::IsTagInEssentialList(UINT32 Tag)
- Author: Markn
+ Author: Mark_Neves (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 16/8/96
Inputs: Tag = tag value to look for
Returns: TRUE if found, FALSE otherwsie
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1081)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1082)
@@ -252,7 +252,7 @@
}
else
{
-PORTNOTE("other","Removed IDD_TPALETTE - doesn't exist in resources")
+PORTNOTE("other","Removed _R(IDD_TPALETTE) - doesn't exist in resources")
#ifndef EXCLUDE_FROM_XARALX
// Not exporting a bitmap from the bitmap gallery
AddAPage(_R(IDD_TPALETTE));
@@ -266,13 +266,13 @@
bool fUsedImapOption = false;
if (ok && !bExportABitmap && m_FilterType != MAKE_BITMAP_FILTER && !m_bSlicingImage)
{
-PORTNOTE("other","Removed IDD_TPALETTE & IDD_TBROWSER - doesn't exist in resources and isn't wanted (in that order)")
+PORTNOTE("other","Removed _R(IDD_TPALETTE) & _R(IDD_TBROWSER) - doesn't exist in resources and isn't wanted (in that order)")
// ok = AddAPage(_R(IDD_TBITMAPOPTIONS)) && AddAPage(_R(IDD_TIMAPOPTIONS)) && AddAPage(_R(IDD_TBROWSER));
ok = AddAPage(_R(IDD_TBITMAPOPTIONS));
fUsedImapOption = true;
}
-PORTNOTE("other","Removed IDD_TPALETTE - doesn't exist in resources")
+PORTNOTE("other","Removed _R(IDD_TPALETTE) - doesn't exist in resources")
#ifndef EXCLUDE_FROM_XARALX// design notes stuff on the image map page is needed in image slicing
if (ok && m_bSlicingImage)
{
Index: Trunk/XaraLX/wxOil/binreloc.c
===================================================================
--- Trunk/XaraLX/wxOil/binreloc.c (revision 1081)
+++ Trunk/XaraLX/wxOil/binreloc.c (revision 1082)
@@ -1,3 +1,6 @@
+// $Id: binreloc.c 757 2006-04-01 16:04:45Z alex $
+// The following line makes normalize.pl skip type fixing
+/* SKIPFIXTYPES: START */
// $Id: appstate.cpp 836 2006-04-18 16:06:15Z gerry $
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Index: Trunk/XaraLX/wxOil/binreloc.h
===================================================================
--- Trunk/XaraLX/wxOil/binreloc.h (revision 1081)
+++ Trunk/XaraLX/wxOil/binreloc.h (revision 1082)
@@ -1,4 +1,6 @@
// $Id$
+// The following line makes normalize.pl skip type fixing
+/* SKIPFIXTYPES: START */
/* @@tag:xara-cn@@ DO NOT MODIFY THIS LINE
================================XARAHEADERSTART===========================
Index: Trunk/XaraLX/wxOil/xpoilflt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xpoilflt.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/xpoilflt.cpp (revision 1082)
@@ -358,7 +358,7 @@
wxArrayString saOutput;
wxArrayString saErrors;
- int code = wxExecute(sCommand, saOutput, saErrors);
+ INT32 code = wxExecute(sCommand, saOutput, saErrors);
TRACE(_T("wxExecute returned %d"), code);
if (code == 0)
{
@@ -438,7 +438,7 @@
// the processing of stderr for errors, warnings and progress
CamProcess TheProc(NULL, &TempFile);
- int code = TheProc.Execute(sCommand);
+ INT32 code = TheProc.Execute(sCommand);
TempFile.close();
if (code != 0)
{
@@ -547,7 +547,7 @@
wxArrayString saOutput;
wxArrayString saErrors;
- int code = wxExecute(sCommand, saOutput, saErrors);
+ INT32 code = wxExecute(sCommand, saOutput, saErrors);
for (UINT32 i = 0; i < saErrors.GetCount(); i++)
{
@@ -623,7 +623,7 @@
// the processing of stderr for errors, warnings and progress
CamProcess TheProc(&TempFile, NULL);
- int code = TheProc.Execute(sCommand);
+ INT32 code = TheProc.Execute(sCommand);
TempFile.close();
if (code != 0)
{
Index: Trunk/XaraLX/wxOil/customlist.cpp
===================================================================
--- Trunk/XaraLX/wxOil/customlist.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/customlist.cpp (revision 1082)
@@ -1125,4 +1125,4 @@
}
return CWnd::OnMouseWheel(nFlags, zDelta, pt);
}
-
\ No newline at end of file
+
Index: Trunk/XaraLX/wxOil/xmlutils.h
===================================================================
--- Trunk/XaraLX/wxOil/xmlutils.h (revision 1081)
+++ Trunk/XaraLX/wxOil/xmlutils.h (revision 1082)
@@ -121,7 +121,7 @@
#if _DEBUG
static void Test();
- static int example4(const char *filename, const xmlChar * xpathExpr, const xmlChar * value);
+ static INT32 example4(const char *filename, const xmlChar * xpathExpr, const xmlChar * value);
static void update_xpath_nodes(xmlNodeSetPtr nodes, const xmlChar * value);
#endif
@@ -136,23 +136,23 @@
const CString& strEncoding);
static IXMLDOMElementPtr AppendElement(IXMLDOMElementPtr pContext, const CString& elname, const CString* value = NULL);
- static IXMLDOMElementPtr AppendElement(IXMLDOMElementPtr pContext, const CString& elname, const LONG lValue);
+ static IXMLDOMElementPtr AppendElement(IXMLDOMElementPtr pContext, const CString& elname, const INT32 lValue);
static IXMLDOMElementPtr AppendElement(IXMLDOMElementPtr pContext, const CString& elname, const BOOL bValue);
static BOOL ReplaceElement(IXMLDOMElementPtr pElement, const CString& strElPath, const CString& strText, const BOOL bIgnoreBlank = FALSE);
- static BOOL ReplaceElement(IXMLDOMElementPtr pElement, const CString& strElPath, const LONG lValue);
+ static BOOL ReplaceElement(IXMLDOMElementPtr pElement, const CString& strElPath, const INT32 lValue);
static BOOL ReplaceElement(IXMLDOMElementPtr pElement, const CString& strElPath, const BOOL bValue);
static CString GetNodeString(IXMLDOMNodePtr pNode, const CString& strNodePath, const CString& strDefault = _T(""));
- static LONG GetNodeLong(IXMLDOMNodePtr pNode, const CString& strNodePath, const LONG lDefault = 0);
+ static INT32 GetNodeLong(IXMLDOMNodePtr pNode, const CString& strNodePath, const INT32 lDefault = 0);
static BOOL GetNodeBOOL(IXMLDOMNodePtr pNode, const CString& strNodePath, const BOOL bDefault = FALSE);
static CString GetAttributeString(IXMLDOMElementPtr pNode, const CString& strAttrName, const CString& strDefault = _T(""));
- static LONG GetAttributeLong(IXMLDOMElementPtr pNode, const CString& strAttrName, const LONG lDefault = 0);
+ static INT32 GetAttributeLong(IXMLDOMElementPtr pNode, const CString& strAttrName, const INT32 lDefault = 0);
static BOOL GetAttributeBOOL(IXMLDOMElementPtr pNode, const CString& strAttrName, const BOOL bDefault = FALSE);
static BOOL SetAttribute(IXMLDOMNodePtr pNode, const CString& strName, const CString& strValue);
- static BOOL SetAttribute(IXMLDOMNodePtr pNode, const CString& strName, const LONG lValue);
+ static BOOL SetAttribute(IXMLDOMNodePtr pNode, const CString& strName, const INT32 lValue);
static BOOL SetAttribute(IXMLDOMNodePtr pNode, const CString& strName, const BOOL bValue);
static CString GetNodeName(IXMLDOMNodePtr pNode);
Index: Trunk/XaraLX/wxOil/camelot.h
===================================================================
--- Trunk/XaraLX/wxOil/camelot.h (revision 1081)
+++ Trunk/XaraLX/wxOil/camelot.h (revision 1082)
@@ -142,7 +142,7 @@
void GiveActiveCanvasFocus();
- int FilterEvent( wxEvent& event );
+ int /*TYPENOTE: Correct*/ FilterEvent( wxEvent& event );
protected:
std::auto_ptr<wxDocManager> m_docManager;
Index: Trunk/XaraLX/wxOil/camprocess.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/camprocess.cpp (revision 1082)
@@ -295,7 +295,7 @@
}
-void CamProcess::OnTerminate(int pid, int status)
+void CamProcess::OnTerminate(int /*TYPENOTE: Correct*/ pid, int /*TYPENOTE: Correct*/ status)
{
TRACEUSER("Gerry", _T("CamProcess::OnTerminate pid = %d status = %d"), pid, status);
m_bDead = true;
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/camelot.cpp (revision 1082)
@@ -213,7 +213,7 @@
}
/*********************************************************************************************
-> int CCamApp::FilterEvent( wxEvent& event )
+> int TYPENOTE: Correct CCamApp::FilterEvent( wxEvent& event )
Author: Luke_Hart (Xara Group Ltd) <LukeH@xxxxxxxx>
Created: 09/05/06
@@ -230,9 +230,9 @@
SeeAlso: The focus handling document
**********************************************************************************************/
-int CCamApp::FilterEvent( wxEvent& event )
+int /*TYPENOTE: Correct*/ CCamApp::FilterEvent( wxEvent& event )
{
- static long lLastTimeStamp = 0;
+ static INT32 lLastTimeStamp = 0;
if( event.GetEventType() == wxEVT_CHAR )
{
@@ -1233,7 +1233,7 @@
{
// Get the locale id
wxString strLocale( setlocale( LC_MESSAGES, NULL ), wxConvUTF8 );
- int ordSep = strLocale.Find( _T('_' ) );
+ INT32 ordSep = strLocale.Find( _T('_' ) );
if( -1 != ordSep )
strLocale = strLocale.Left( ordSep );
TRACEUSER( "jlh92", _T("Locale = %s
"), PCTSTR(strLocale) );
Index: Trunk/XaraLX/wxOil/dropdown.h
===================================================================
--- Trunk/XaraLX/wxOil/dropdown.h (revision 1081)
+++ Trunk/XaraLX/wxOil/dropdown.h (revision 1082)
@@ -1,12 +1,12 @@
// $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.
- 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
----------------------------------
@@ -71,11 +71,11 @@
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/
+ 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/
+ 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
@@ -90,11 +90,11 @@
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/
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
=================================XARAHEADEREND============================
-*/
+ */
// dropdown.h - The Drop-down list base class
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 1082)
@@ -1,12 +1,12 @@
// $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.
- 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
----------------------------------
@@ -71,11 +71,11 @@
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/
+ 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/
+ 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
@@ -90,11 +90,11 @@
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/
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
=================================XARAHEADEREND============================
-*/
+ */
// Implementation of the DialogManager class (bodge central)
@@ -259,7 +259,7 @@
TabType m_TabType;
virtual wxBookCtrlBase* CreateBookCtrl()
{
- int style = wxCLIP_CHILDREN | wxBC_DEFAULT;
+ INT32 style = wxCLIP_CHILDREN | wxBC_DEFAULT;
switch (m_TabType)
{
Index: Trunk/XaraLX/wxOil/camprocess.h
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.h (revision 1081)
+++ Trunk/XaraLX/wxOil/camprocess.h (revision 1082)
@@ -112,7 +112,7 @@
CamProcess(CCLexFile* pInFile = NULL, CCLexFile* pOutFile = NULL);
virtual ~CamProcess();
- virtual void OnTerminate(int pid, int status);
+ virtual void OnTerminate(int /*TYPENOTE: Correct*/ pid, int /*TYPENOTE: Correct*/ status);
// These are called to handle the various streams
// StdIn and StdOut are only called when a file isn't being used
Index: Trunk/XaraLX/wxOil/dropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dropdown.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/dropdown.cpp (revision 1082)
@@ -1,12 +1,12 @@
// $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.
- 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
----------------------------------
@@ -71,11 +71,11 @@
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/
+ 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/
+ 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
@@ -90,11 +90,11 @@
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/
+ Xara Group Ltd, Gaddesden Place, Hemel Hempstead, HP2 6EX, UK.
+ http://www.xara.com/
=================================XARAHEADEREND============================
-*/
+ */
// dropdown.cpp - Drop-down list base class
Index: Trunk/XaraLX/wxOil/xmlutils.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xmlutils.cpp (revision 1081)
+++ Trunk/XaraLX/wxOil/xmlutils.cpp (revision 1082)
@@ -248,7 +248,7 @@
*
* Returns 0 on success and a negative value otherwise.
*/
-int CXMLUtils::example4(const char* filename, const xmlChar* xpathExpr, const xmlChar* value)
+INT32 CXMLUtils::example4(const char* filename, const xmlChar* xpathExpr, const xmlChar* value)
{
xmlDocPtr doc;
xmlXPathContextPtr xpathCtx;
@@ -311,8 +311,8 @@
*/
void CXMLUtils::update_xpath_nodes(xmlNodeSetPtr nodes, const xmlChar* value)
{
- int size;
- int i;
+ INT32 size;
+ INT32 i;
assert(value);
size = (nodes) ? nodes->nodeNr : 0;
Xara