[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1619
Date       : Mon Jul 31 13:06:45 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/varstr.h
   M /Trunk/XaraLX/xarlib/Makefile.am

Fix xarlib compilation


Diff:
Index: Trunk/XaraLX/xarlib/Makefile.am
===================================================================
--- Trunk/XaraLX/xarlib/Makefile.am	(revision 1618)
+++ Trunk/XaraLX/xarlib/Makefile.am	(revision 1619)
@@ -75,6 +75,7 @@
 	../wxOil/cammemory.cpp \
 	../wxOil/pathname.cpp \
 	../wxOil/unicdman.cpp \
+	../wxOil/varstr.cpp \
 	../xarlib/camelot.cpp \
 	../xarlib/ensure.cpp \
 	../xarlib/xarlib.cpp
Index: Trunk/XaraLX/wxOil/varstr.h
===================================================================
--- Trunk/XaraLX/wxOil/varstr.h	(revision 1618)
+++ Trunk/XaraLX/wxOil/varstr.h	(revision 1619)
@@ -138,10 +138,12 @@
 	StringVar& operator=(const TCHAR* s);
 	StringVar& operator=(const TCHAR ch);
 
+#if !defined(EXCLUDE_FROM_XARLIB)
 	// Special internationalisation stuff...
 	virtual void MakePercent(INT32 Value);
 	virtual void MakePercent(double Value);
 	virtual void MakePercent(TCHAR *Value);
+#endif
 
 private:
 	// Worker functions


Xara