[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1168
Date       : Tue May 23 07:57:56 BST 2006

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

Actually allow then bitmap export to allow selection of a file


Diff:
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1167)
+++ Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1168)
@@ -136,6 +136,7 @@
 #include "exjpeg.h"
 
 #include "fileutil.h"
+#include "sgliboil.h"
 
 //#include "resimmap.h"		// For _R(IDS_HTMLIMPORT_FILEDOWNLOAD)
 #include "webaddr.h"		// For class WebAddress
@@ -1008,7 +1009,7 @@
 	// once if theie first guess already exists
 	PathName Path;
 	Filter* pFilter;
-	while( true )
+	do
 	{
 		// 'Do' the dialog and get that filename that we require
 		BOOL DlgResult = FDialog.OpenAndGetFileName();
@@ -1095,7 +1096,7 @@
 		}
 
 		// We must manually check the file doesn't exit here
-		if( wxFile::Exists( Path.GetPath() ) )
+		if( SGLibOil::FileExists( &Path ) )
 		{
 			ErrorInfo Info;
 			Info.ErrorMsg = _R(IDS_SAVEAS_OVERWRITE);
@@ -1124,6 +1125,7 @@
 				ERROR3("Unknown Answer from AskQuestion");
 		}
 	}
+	while( SGLibOil::FileExists( &Path ) ); 
 
 PORTNOTE("other", "Removed BmapPrevDlg usage" )
 #if !defined(EXCLUDE_FROM_XARALX)


Xara