[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1081
Date       : Tue May 16 14:41:24 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/impexpop.cpp

Uses camRename for TCHAR support


Diff:
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1080)
+++ Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1081)
@@ -1218,7 +1218,7 @@
 
 		// delete the empty file, if one was created, and try to rename the file
 		FileUtil::DeleteFile(&Path);
-		
+/*		
 #if defined(__WXGTK__) && FALSE != wxUSE_UNICODE
 		char pszTempName[256];
 		char pszFinalName[256];
@@ -1228,8 +1228,10 @@
 		char* pszTempName = TempName;
 		char* pszFinalName = FinalName;
 #endif		
-		
 		bFinished = !rename(pszTempName, pszFinalName);
+*/
+		// This should do the trick but I've left the old code in case
+		bFinished = !camRename(TempName, FinalName);
 
 		if (bFinished)
 		{


Xara