[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1304
Date : Tue Jun 13 00:03:15 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/Makefile.am
M /Trunk/XaraLX/Kernel/filters.cpp
M /Trunk/XaraLX/Kernel/kerneldc.cpp
M /Trunk/XaraLX/Kernel/kerneldc.h
M /Trunk/XaraLX/Kernel/release.cpp
M /Trunk/XaraLX/Kernel/release.h
M /Trunk/XaraLX/Kernel/vectrndr.cpp
M /Trunk/XaraLX/wxOil/oilfltrs.cpp
More EPS export/import work
Diff:
Index: Trunk/XaraLX/Kernel/filters.cpp
===================================================================
--- Trunk/XaraLX/Kernel/filters.cpp (revision 1303)
+++ Trunk/XaraLX/Kernel/filters.cpp (revision 1304)
@@ -100,10 +100,10 @@
#include "camtypes.h"
//#include "filters.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "epsfiltr.h"
+#include "epsfiltr.h"
//#include "coreleps.h"
-//#include "aw_eps.h"
-//#include "cameleps.h"
+#include "aw_eps.h"
+#include "cameleps.h"
//#include "ai_eps.h"
//#include "ai5_eps.h"
//#include "ai8_eps.h"
@@ -124,7 +124,7 @@
//#include "fillattr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
//#include "attrmgr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
#include "native.h" // The new designed native filter, used for v2
-//#include "nativeps.h" // The old style EPS native filter, used in v1.1
+#include "nativeps.h" // The old style EPS native filter, used in v1.1
#include "layer.h"
//#include "nev.h"
//#include "coplfilr.h"
@@ -759,16 +759,18 @@
#if BUILD_TEXT_FILTERS
ADD_FILTER(TextFilterFamily)
#endif
+#endif
// Create, initialise and install the Generic EPS import filter
#ifndef STANDALONE
ADD_FILTER(GenericEPSFilter)
#endif
-#endif
+#ifndef EXCLUDE_FROM_XARALX
// Remove this next line to add the CDR / CMX filters...
#ifndef NOCDRCMX
ADD_FILTER(PaletteFilterFamily)
#endif
+#endif
// Create, initialise and install the other supported filters:
// This must be the first filter that uses .xar or "Save as" wont work
@@ -777,11 +779,8 @@
#ifndef EXCLUDE_FROM_XARALX
ADD_FILTER(CamelotWebFilter) // The minimalistic form of the v2 native filter
#endif
-PORTNOTETRACE("filter","Removed EPS filters usage");
-#ifndef EXCLUDE_FROM_XARALX
-// ADD_FILTER(CamelotEPSFilter)
-// ADD_FILTER(CamelotNativeEPSFilter) // The old style EPS native filter, used in v1.1
-#endif
+ ADD_FILTER(CamelotEPSFilter)
+ ADD_FILTER(CamelotNativeEPSFilter) // The old style EPS native filter, used in v1.1
// Winoil filters are initialised here to prevent the drop-down list from being
// mis-ordered.
@@ -811,7 +810,7 @@
// Other filters in alphabetical order.
PORTNOTE("filter","Removed filters usage")
#ifndef EXCLUDE_FROM_XARALX
-/* ADD_FILTER(AcornDrawFilter)
+ ADD_FILTER(AcornDrawFilter)
// Adobe AI / EPS filters.
ADD_FILTER(AIEPSFilter)
@@ -819,8 +818,11 @@
ADD_FILTER(AI8EPSFilter)
ADD_FILTER(PhotoShopEPSFilter)
+#endif
- ADD_FILTER(ArtWorksEPSFilter) */
+ ADD_FILTER(ArtWorksEPSFilter)
+PORTNOTE("filter","Removed filters usage")
+#ifndef EXCLUDE_FROM_XARALX
// ADD_FILTER(BMPFilter)
Index: Trunk/XaraLX/Kernel/Makefile.am
===================================================================
--- Trunk/XaraLX/Kernel/Makefile.am (revision 1303)
+++ Trunk/XaraLX/Kernel/Makefile.am (revision 1304)
@@ -71,6 +71,7 @@
tracergn.cpp bfxbase.cpp coldlog.cpp colmenu.cpp sgline.cpp sgline2.cpp \
sgstroke.cpp sgbrush.cpp lattrops.cpp la_base.cpp maskedrr.cpp \
cameleps.cpp epscdef.cpp epsclist.cpp epssitem.cpp epsstack.cpp \
- nativeps.cpp epsfiltr.cpp aw_eps.cpp saveeps.cpp
+ nativeps.cpp epsfiltr.cpp aw_eps.cpp saveeps.cpp vectrndr.cpp kerneldc.cpp \
+ release.cpp
AM_CXXFLAGS = $(XARAFLAGS)
Index: Trunk/XaraLX/Kernel/release.h
===================================================================
--- Trunk/XaraLX/Kernel/release.h (revision 1303)
+++ Trunk/XaraLX/Kernel/release.h (revision 1304)
@@ -116,10 +116,10 @@
class ReleaseInfo
{
public:
- static const char* GetInfo();
- static const char* GetLicensee();
- static const char* GetSerialNumber();
- static const char* GetCompany();
+ static const TCHAR* GetInfo();
+ static const TCHAR* GetLicensee();
+ static const TCHAR* GetSerialNumber();
+ static const TCHAR* GetCompany();
static void CacheProfileSettings();
static BOOL RestoreProfileSettings();
@@ -129,7 +129,7 @@
private:
UINT32 SerialNumber;
- const char *Name;
+ const TCHAR *Name;
};
#endif
Index: Trunk/XaraLX/Kernel/kerneldc.h
===================================================================
--- Trunk/XaraLX/Kernel/kerneldc.h (revision 1303)
+++ Trunk/XaraLX/Kernel/kerneldc.h (revision 1304)
@@ -144,7 +144,7 @@
{
public:
KernelDC(RenderType Type);
- KernelDC(wxDC* pDC, RenderType Type);
+ KernelDC(CNativeDC * pDC, RenderType Type);
public:
// Functions to output in PostScript format.
Index: Trunk/XaraLX/Kernel/kerneldc.cpp
===================================================================
--- Trunk/XaraLX/Kernel/kerneldc.cpp (revision 1303)
+++ Trunk/XaraLX/Kernel/kerneldc.cpp (revision 1304)
@@ -160,7 +160,7 @@
********************************************************************************************/
-KernelDC::KernelDC(CDC *pDC, RenderType rType) : CCDC(pDC, rType)
+KernelDC::KernelDC(CNativeDC *pDC, RenderType rType) : CCDC(pDC, rType)
{
// Initialise other fields.
LineWidth = 0;
@@ -263,7 +263,7 @@
BOOL KernelDC::OutputUserSpaceValue(MILLIPOINT n, EPSAccuracy Accuracy)
{
- char Buf[20];
+ TCHAR Buf[20];
INT32 Integer;
INT32 Fraction;
@@ -283,24 +283,24 @@
// If fraction is 0, just output integer value.
if (Fraction == 0)
{
- wsprintf(Buf, "%d", Integer);
+ camSprintf(Buf, _T("%d"), Integer);
}
else if (FullAccuracy)
{
// Full 3dp accuracy
if ((n < 0) && (Integer == 0))
- wsprintf(Buf, "-%d.%.3d", Integer, Abs(Fraction));
+ camSprintf(Buf, _T("-%d.%.3d"), Integer, Abs(Fraction));
else
- wsprintf(Buf, "%d.%.3d", Integer, Abs(Fraction));
+ camSprintf(Buf, _T("%d.%.3d"), Integer, Abs(Fraction));
}
else
{
// Normal 2dp accuracy
Fraction /= 10;
if ((n < 0) && (Integer == 0))
- wsprintf(Buf, "-%d.%.2d", Integer, Abs(Fraction));
+ camSprintf(Buf, _T("-%d.%.2d"), Integer, Abs(Fraction));
else
- wsprintf(Buf, "%d.%.2d", Integer, Abs(Fraction));
+ camSprintf(Buf, _T("%d.%.2d"), Integer, Abs(Fraction));
}
break;
@@ -312,7 +312,7 @@
Integer = (n - 500) / 1000;
// Output to string (accurate to 0dp)
- wsprintf(Buf, "%d", Integer);
+ camSprintf(Buf, _T("%d"), Integer);
break;
case ACCURACY_ROUNDUP:
@@ -323,7 +323,7 @@
Integer = n / 1000;
// Output to string (accurate to 0dp)
- wsprintf(Buf, "%d", Integer);
+ camSprintf(Buf, _T("%d"), Integer);
break;
}
@@ -354,9 +354,9 @@
INT32 Fraction = ((n % 255) * 100) / 255;
// Output to string
- char Buf[20];
+ TCHAR Buf[20];
// Ensure we always get at least 2 decimal figures with %.2d
- wsprintf(Buf, "%d.%.2d", Integer, Abs(Fraction));
+ camSprintf(Buf, _T("%d.%.2d"), Integer, Abs(Fraction));
return OutputToken(Buf);
}
@@ -441,7 +441,7 @@
{
// This is a 'no colour' type colour, so output a zero-length colour name,
// as this is the only way we can handle this at the moment.
- if (!OutputString(""))
+ if (!OutputString(_T("")))
return FALSE;
}
else
@@ -461,7 +461,7 @@
}
// Always tint 0
- return OutputToken("0");
+ return OutputToken(_T("0"));
}
@@ -498,7 +498,7 @@
{
// This is a 'no colour' type colour, so output a zero-length colour name,
// as this is the only way we can handle this at the moment.
- ok = OutputString("");
+ ok = OutputString(_T(""));
}
else
{
@@ -547,7 +547,7 @@
// Copy the string, looking for embedded delimiters.
INT32 src = 0,
dst = 1;
- while ( (pString[src] != _T(0)) && (dst < 120 ) ) //while ((pString[src] != 0) && (dst < 120))-adapted for DBCS
+ while ( (pString[src]) && (dst < 120 ) ) //while ((pString[src] != 0) && (dst < 120))-adapted for DBCS
{
if( (pString[src]== _T('(')) || (pString[src]==_T(')')) || (pString[src]== _T('\')) )
//if( (pString[src] == '(') || (pString[src] == ')') || (pString[src] == '\') )-adapted for DBCS
@@ -625,7 +625,7 @@
BOOL KernelDC::OutputValue(INT32 Value)
{
TCHAR buf[30];
- _stprintf(buf, "%ld", Value);
+ camSprintf(buf, _T("%d"), Value);
return OutputToken(buf);
}
@@ -646,7 +646,7 @@
BOOL KernelDC::OutputValue(UINT32 Value)
{
TCHAR buf[30];
- _stprintf(buf, "%lu", Value);
+ camSprintf(buf, _T("%u"), Value);
return OutputToken(buf);
}
@@ -671,7 +671,7 @@
// Save floating point in scientific notation (because otherwise the number output
// could be very long, e.g. 6.2e66 or similar would be very long if we didn't use
// the exponent syntax).
- _stprintf(buf, "%g", Value);
+ camSprintf(buf, _T("%g"), Value);
return OutputToken(buf);
}
@@ -701,14 +701,14 @@
switch (DecPl)
{
- case 1: _stprintf(buf,"%.1f",Value); break;
- case 2: _stprintf(buf,"%.2f",Value); break;
- case 4: _stprintf(buf,"%.4f",Value); break;
- case 5: _stprintf(buf,"%.5f",Value); break;
- case 6: _stprintf(buf,"%.6f",Value); break;
- case 7: _stprintf(buf,"%.7f",Value); break;
- case 8: _stprintf(buf,"%.8f",Value); break;
- default:_stprintf(buf,"%.3f",Value); break;
+ case 1: camSprintf(buf,_T("%.1f"),Value); break;
+ case 2: camSprintf(buf,_T("%.2f"),Value); break;
+ case 4: camSprintf(buf,_T("%.4f"),Value); break;
+ case 5: camSprintf(buf,_T("%.5f"),Value); break;
+ case 6: camSprintf(buf,_T("%.6f"),Value); break;
+ case 7: camSprintf(buf,_T("%.7f"),Value); break;
+ case 8: camSprintf(buf,_T("%.8f"),Value); break;
+ default:camSprintf(buf,_T("%.3f"),Value); break;
}
// supress a few trailing zero's
@@ -758,7 +758,7 @@
BOOL KernelDC::OutputArray(INT32* Array, INT32 ArraySize)
{
// Output the 'ArrayStart'
- if (!OutputToken("["))
+ if (!OutputToken(_T("[")))
return FALSE;
// Output the actual array elements
@@ -769,7 +769,7 @@
}
// Output the 'ArrayEnd'
- if (!OutputToken("]"))
+ if (!OutputToken(_T("]")))
return FALSE;
return TRUE;
@@ -891,11 +891,11 @@
INT32 Nybble = (Data[DataOfs] & 0xF0) >> 4;
ENSURE(Nybble < 16, "Bad hex digit in KernelDC::ConvertToHex");
- char Ch;
+ TCHAR Ch;
if (Nybble < 10)
- Ch = '0' + (char) Nybble;
+ Ch = '0' + (TCHAR) Nybble;
else
- Ch = 'A' + (char) (Nybble - 10);
+ Ch = 'A' + (TCHAR) (Nybble - 10);
Buf[DestOfs++] = Ch;
@@ -903,9 +903,9 @@
ENSURE(Nybble < 16, "Bad hex digit in KernelDC::ConvertToHex");
if (Nybble < 10)
- Ch = '0' + (char) Nybble;
+ Ch = '0' + (TCHAR) Nybble;
else
- Ch = 'A' + (char) (Nybble - 10);
+ Ch = 'A' + (TCHAR) (Nybble - 10);
Buf[DestOfs++] = Ch;
@@ -968,7 +968,7 @@
INT32 nBytes = FlushASCII85Buffer();
// End of ASCII85 data, so output the ASCII85 EOD marker.
- char EOD[] = "~>";
+ TCHAR EOD[] = _T("~>");
OutputDirect((LPBYTE) EOD, 2);
OutputNewLine();
@@ -1127,7 +1127,7 @@
*/
// Start at the beginning of the buffer
- INT32 SrcOfs = 0;
+// INT32 SrcOfs = 0;
INT32 DstOfs = 0;
while (Length > 0)
@@ -1233,7 +1233,7 @@
85 * 85 * 85 * 85 };
// Start at the beginning of the buffer
- INT32 SrcOfs = 0;
+// INT32 SrcOfs = 0;
INT32 DstOfs = 0;
BOOL FoundEOD = FALSE;
@@ -1537,7 +1537,11 @@
}
// Sanity checks
- ERROR2IF(j != Size, (*pLength = 0, NULL), "Incorrect decoding of Run length data");
+ if (j!=Size)
+ {
+ *pLength=0;
+ ERROR2(NULL, "Incorrect decoding of Run length data");
+ }
// Ok, we've decoded it.
*pLength = j;
Index: Trunk/XaraLX/Kernel/vectrndr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/vectrndr.cpp (revision 1303)
+++ Trunk/XaraLX/Kernel/vectrndr.cpp (revision 1304)
@@ -397,8 +397,8 @@
********************************************************************************************/
void VectorFileRenderRegion::DrawBitmapBlob( const DocCoord &Point,
- UINT32 BitmapID,
- UINT32 ToolID )
+ UINT32 BitmapID/*,
+ UINT32 ToolID*/ )
{
ENSURE( FALSE, "DrawBitmapBlob called while exporting!" );
}
Index: Trunk/XaraLX/Kernel/release.cpp
===================================================================
--- Trunk/XaraLX/Kernel/release.cpp (revision 1303)
+++ Trunk/XaraLX/Kernel/release.cpp (revision 1304)
@@ -103,7 +103,7 @@
#include "camtypes.h"
//#include "release.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-#include "brandinf.h"
+//#include "brandinf.h"
//#include "justin2.h"
//#include "app.h" // Camelot object - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -111,6 +111,8 @@
// lets declare a Unicode version of the name, which will be much harder to find
+PORTNOTE("other", "Removed branding stuff")
+#ifndef EXCLUDE_FROM_XARALX
// put these in a different segment to the others
#pragma data_seg( "CAMELOT", "DATA" )
struct
@@ -127,20 +129,35 @@
BRANDED_COMPANY_UNICODE
};
+#endif
+
+#ifndef BRANDED_NAME_MAX
+ #define BRANDED_NAME_MAX 255
+#endif
+
#pragma data_seg()
-struct
+struct p
{
UINT32 Magic;
UINT32 Serial;
- char Name[BRANDED_NAME_MAX];
- char Company[BRANDED_NAME_MAX];
+ TCHAR Name[BRANDED_NAME_MAX];
+ TCHAR Company[BRANDED_NAME_MAX];
} PublicInfo =
+#ifndef EXCLUDE_FROM_XARALX
{
BRANDED_MAGIC1,
BRANDED_SERIALNUMBER,
BRANDED_NAME,
BRANDED_COMPANY
};
+#else
+{
+ 0,
+ 0,
+ _T("Unregistered user"),
+ _T("Unregistered company")
+};
+#endif
// bug - before 28/2/97 only allocated 10 chars so when it puts 101- and then the
// number to 9 places it will overflow into the next string. This string dictates
@@ -158,15 +175,15 @@
// this returns the obvious user name. Not hidden at all
-// Why was this class written to use type char, not TCHAR? This is a royal pain in the backside.
+// Why was this class written to use type TCHAR, not TCHAR? This is a royal pain in the backside.
-const char *ReleaseInfo::GetInfo()
+const TCHAR *ReleaseInfo::GetInfo()
{
- static char buf[256];
+ static TCHAR buf[256];
#ifndef STANDALONE
-// wsprintf(buf, "%s (#101-%09ld)", PublicInfo.Name, PublicInfo.Serial );
-// wsprintf(buf, TEXT("%s (#%s)"), ReleaseInfo::GetLicensee(), ReleaseInfo::GetSerialNumber());
+// camSprintf(buf, "%s (#101-%09ld)", PublicInfo.Name, PublicInfo.Serial );
+// camSprintf(buf, TEXT("%s (#%s)"), ReleaseInfo::GetLicensee(), ReleaseInfo::GetSerialNumber());
String_256 jcf;
jcf.MakeMsg(_R(IDS_RELEASE_INFO_FORMAT), ReleaseInfo::GetLicensee(), ReleaseInfo::GetSerialNumber());
@@ -181,15 +198,15 @@
//***************************************************************************
-const char* ReleaseInfo::GetLicensee()
+const TCHAR* ReleaseInfo::GetLicensee()
{
- static char buffer[64];
-#ifdef _DEBUG
- char* pLogName=_tgetenv("LOGNAME");
+ static TCHAR buffer[64];
+#if !defined(EXCLUDE_FROM_XARALX) && defined(_DEBUG)
+ TCHAR* pLogName=_tgetenv(TCHAR);
if (pLogName!=NULL)
- wsprintf(buffer,"%s",pLogName);
+ camSprintf(buffer,_T("%s"),pLogName);
else
- wsprintf(buffer,"%s","NoLogName");
+ camSprintf(buffer,_T("%s"),("NoLogName"));
#else
// read the licensee preference value into a string
String_256 Str;
@@ -198,12 +215,12 @@
{
// copy the string into the return buffer
TCHAR* StringBuf = (TCHAR*)Str;
- wsprintf(buffer, "%s", StringBuf);
+ camSprintf(buffer, _T("%s"), StringBuf);
}
else
{
// something went wrong so use a default, the bound in one
- wsprintf(buffer,"%s",PublicInfo.Name);
+ camSprintf(buffer,_T("%s"),PublicInfo.Name);
}
#endif
@@ -212,9 +229,9 @@
//***************************************************************************
-const char* ReleaseInfo::GetSerialNumber()
+const TCHAR* ReleaseInfo::GetSerialNumber()
{
- static char buffer[64];
+ static TCHAR buffer[64];
// read the serial number preference value into a string
String_256 Str;
@@ -223,12 +240,12 @@
{
// copy the string into the return buffer
TCHAR* StringBuf = (TCHAR*)Str;
- wsprintf(buffer, "%s", StringBuf);
+ camSprintf(buffer, _T("%s"), StringBuf);
}
else
{
// something went wrong so use a default, the bound in one
- wsprintf(buffer,"101-%09ld",PublicInfo.Serial);
+ camSprintf(buffer,_T("101-%09ld"),PublicInfo.Serial);
}
return buffer;
@@ -236,9 +253,9 @@
//***************************************************************************
-const char* ReleaseInfo::GetCompany()
+const TCHAR* ReleaseInfo::GetCompany()
{
- static char buffer[64];
+ static TCHAR buffer[64];
// read the company preference value into a string
String_256 Str;
BOOL ok = Camelot.GetPrefDirect(szUISection, szCompany, &Str);
@@ -246,12 +263,12 @@
{
// coy the string into the return buffer
TCHAR* StringBuf = (TCHAR*)Str;
- wsprintf(buffer, "%s", StringBuf);
+ camSprintf(buffer, _T("%s"), StringBuf);
}
else
{
// something went wrong so use a default, the bound in one
- wsprintf(buffer,"%s",PublicInfo.Company);
+ camSprintf(buffer,_T("%s"),PublicInfo.Company);
}
return buffer;
@@ -275,13 +292,13 @@
***********************************************************************************************/
void ReleaseInfo::CacheProfileSettings()
{
- strcpy(PublicInfo.Name, GetLicensee());
+ camStrcpy(PublicInfo.Name, GetLicensee());
#ifndef WEBSTER
// No serial number in Webster v2.0.
// This happens too early to get resources.
- strcpy(szCachedSerial, GetSerialNumber());
+ camStrcpy(szCachedSerial, GetSerialNumber());
#endif
- strcpy(PublicInfo.Company, GetCompany());
+ camStrcpy(PublicInfo.Company, GetCompany());
}
/***********************************************************************************************
Index: Trunk/XaraLX/wxOil/oilfltrs.cpp
===================================================================
--- Trunk/XaraLX/wxOil/oilfltrs.cpp (revision 1303)
+++ Trunk/XaraLX/wxOil/oilfltrs.cpp (revision 1304)
@@ -754,7 +754,7 @@
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
***** Definition of the OILy parts for individual filters *****
@@ -811,8 +811,8 @@
#endif
-PORTNOTE("EpsFilter", "Removed use of EPS filters")
-#if !defined(EXCLUDE_FROM_XARALX)
+
+
/********************************************************************************************
> ArtWorksEPSOILFilter::EPSOILFilter()
@@ -865,11 +865,10 @@
FilterExt.Load(_R(IDS_FILTEREXT_NATIVE));
}
-#endif
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
@@ -1125,7 +1124,7 @@
#endif
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
@@ -1223,7 +1222,7 @@
FilterExt = Extension;
}
-#endif // EXCLUDE_FROM_RALPH, EXCLUDE_FROM_XARALX
+#endif // EXCLUDE_FROM_RALPH
/********************************************************************************************
@@ -1241,7 +1240,7 @@
FilterExt.Load(_R(IDT_FILTEREXT_BMP));
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
@@ -1348,7 +1347,7 @@
return FilterName;
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
@@ -1432,7 +1431,7 @@
-#endif // EXCLUDE_FROM_RALPH, EXCLUDE_FROM_XARALX
+#endif // EXCLUDE_FROM_RALPH
/********************************************************************************************
@@ -1505,7 +1504,7 @@
FilterExt.Load(_R(IDS_FILTEREXT_PNG));
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
/********************************************************************************************
@@ -1824,7 +1823,7 @@
}
-#if !defined(EXCLUDE_FROM_RALPH) && !defined(EXCLUDE_FROM_XARALX)
+#if !defined(EXCLUDE_FROM_RALPH)
// No text filters as the wonderful new system really encourages innovation!
#if BUILD_OTHER_TEXT_FILTERS
@@ -2023,4 +2022,4 @@
-#endif // EXCLUDE_FROM_RALPH, EXCLUDE_FROM_XARALX
+#endif // EXCLUDE_FROM_RALPH
Xara