[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1276
Date : Thu Jun 8 21:34:43 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/bmapprev.cpp
M /Trunk/XaraLX/Scripts/normalise.pl
M /Trunk/XaraLX/wxOil/camprocess.cpp
M /Trunk/XaraLX/wxOil/errors.cpp
M /Trunk/XaraLX/wxOil/ftfonts.cpp
M /Trunk/XaraLX/wxOil/oilprefs.h
M /Trunk/XaraLX/wxOil/xpoilflt.cpp
Run normalise.pl
Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1275)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp (revision 1276)
@@ -263,13 +263,13 @@
bool fUsedImapOption = false;
if (ok && !bExportABitmap && m_FilterType != MAKE_BITMAP_FILTER && !m_bSlicingImage)
{
-PORTNOTE("other","Removed IDD_TIMAPOPTIONS & IDD_TBROWSER - isn't wanted yet")
+PORTNOTE("other","Removed _R(IDD_TIMAPOPTIONS) & _R(IDD_TBROWSER) - isn't wanted yet")
// ok = AddAPage(_R(IDD_TBITMAPOPTIONS)) && AddAPage(_R(IDD_TIMAPOPTIONS)) && AddAPage(_R(IDD_TBROWSER));
ok = AddAPage(_R(IDD_TBITMAPOPTIONS));
fUsedImapOption = true;
}
-PORTNOTE("other","Removed IDD_TIMAPOPTIONS - isn't wanted yet")
+PORTNOTE("other","Removed _R(IDD_TIMAPOPTIONS) - isn't wanted yet")
#ifndef EXCLUDE_FROM_XARALX// design notes stuff on the image map page is needed in image slicing
if (ok && m_bSlicingImage)
{
Index: Trunk/XaraLX/Scripts/normalise.pl
===================================================================
--- Trunk/XaraLX/Scripts/normalise.pl (revision 1275)
+++ Trunk/XaraLX/Scripts/normalise.pl (revision 1276)
@@ -454,7 +454,7 @@
my $token="INT32";
printf STDERR "$ilab:$inum token $bit, new='%s'
",$new if ($verbose>3);
if ( ( $new =~ /(how|so|bytes of the|entries in the|deg\. in a|too|such a|byte|bytes|rather a|very|Created:|elements|great|it.s a|go the|see|1k|\.one long|in the|bits|short or|short, or|as|to get the|digits|\. Another|To cut a|up of a single|characters|one element|which is BufferSize|fairly|entries|rename the|a power of|REM 10|don.t know the|if file has a|4 or 5|Sorry about the|characters are considered illegal when converting|Two dummy|Find the first bit of the|attribute node. from a|accomodate a) $/i ) ||
- ( $bits[$bit+1] =~ /^.(story|winded|enough|grad table|, but|as possible|narrow boxes|while ago|it took me|life operation|ASCII string|before this|as that|last[,()]s+|time to|filename,\s+|\s+filename of|filename for|one. already exists|way away|names,s+|form, and|time to|filename version|ago|gone\. Returns|directory names|life time|time in the|way behind|pointer|time, there|mother of an extension|is . 32 bits on|and setting BIT_BUF_SIZE|\w+ = wx\w+)/i ) ||
+ ( $bits[$bit+1] =~ /^.(story|winded|running|enough|grad table|, but|as possible|narrow boxes|while ago|it took me|life operation|ASCII string|before this|as that|last[,()]s+|time to|filename,\s+|\s+filename of|filename for|one. already exists|way away|names,s+|form, and|time to|filename version|ago|gone\. Returns|directory names|life time|time in the|way behind|pointer|time, there|mother of an extension|is . 32 bits on|and setting BIT_BUF_SIZE|\w+ = wx\w+)/i ) ||
($bits[$bit] =~ /^s+$/)
)
{
Index: Trunk/XaraLX/wxOil/ftfonts.cpp
===================================================================
--- Trunk/XaraLX/wxOil/ftfonts.cpp (revision 1275)
+++ Trunk/XaraLX/wxOil/ftfonts.cpp (revision 1276)
@@ -922,7 +922,7 @@
// in addition to the synthesized unicode charmap and if so, use that
// instead.
FT_CharMap pCustomCharmap = NULL;
- for (int mapnum = 0; mapnum < pFreeTypeFace->num_charmaps; mapnum++)
+ for (INT32 mapnum = 0; mapnum < pFreeTypeFace->num_charmaps; mapnum++)
{
FT_CharMap pThisMap = pFreeTypeFace->charmaps[mapnum];
if (pThisMap->encoding == FT_ENCODING_ADOBE_CUSTOM
Index: Trunk/XaraLX/wxOil/xpoilflt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/xpoilflt.cpp (revision 1275)
+++ Trunk/XaraLX/wxOil/xpoilflt.cpp (revision 1276)
@@ -1578,7 +1578,7 @@
// TRACEUSER("Gerry", _T("XPFProgress:%s"), rest.c_str());
if (m_pFilter)
{
- unsigned long Val = wxStrtoul(rest.c_str(), NULL, 10);
+ unsigned long /*TYPENOTE: Correct*/ Val = wxStrtoul(rest.c_str(), NULL, 10);
if (Val > 0)
{
// TRACEUSER("Gerry", _T("Setting progress to %d"), Val);
Index: Trunk/XaraLX/wxOil/oilprefs.h
===================================================================
--- Trunk/XaraLX/wxOil/oilprefs.h (revision 1275)
+++ Trunk/XaraLX/wxOil/oilprefs.h (revision 1276)
@@ -129,7 +129,7 @@
const wxString& vendorName = wxEmptyString,
const wxString& localFilename = wxEmptyString,
const wxString& globalFilename = wxEmptyString,
- long style = 0, wxMBConv& conv = wxConvUTF8)
+ long /*TYPENOTE: Correct*/ style = 0, wxMBConv& conv = wxConvUTF8)
: wxConfig(appName, vendorName, localFilename, globalFilename, style, conv) {;}
// Write a preference
Index: Trunk/XaraLX/wxOil/camprocess.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.cpp (revision 1275)
+++ Trunk/XaraLX/wxOil/camprocess.cpp (revision 1276)
@@ -523,7 +523,7 @@
/********************************************************************************************
-> void CamLaunchProcess::OnTerminate(int pid, int status)
+> void CamLaunchProcess::OnTerminate(int /*TYPENOTE: Correct*/ pid, int /*TYPENOTE: Correct*/ status)
Author: Phil_Martin (Xara Group Ltd) <camelotdev@xxxxxxxx>
Created: 19/May/2006
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp (revision 1275)
+++ Trunk/XaraLX/wxOil/errors.cpp (revision 1276)
@@ -589,7 +589,7 @@
butres[2]=Butt2;
butres[3]=Butt3;
butres[4]=Butt4;
- butres[5]=0; // for IDS_HELP - see below
+ butres[5]=0; // for _R(IDS_HELP) - see below
butres[6]=DebugReport;
#if !defined(EXCLUDE_FROM_RALPH)
Xara