[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1413
Date       : Thu Jul  6 10:13:18 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camresource.cpp
   M /Trunk/XaraLX/wxOil/oilfiles.cpp

Fix running on wxWidgets 2.7


Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp	(revision 1412)
+++ Trunk/XaraLX/wxOil/camresource.cpp	(revision 1413)
@@ -1487,6 +1487,8 @@
 	// This is because it tries to initialize the MIME system (sigh)
 	wxMemoryFSHandler::AddFile(_T("resources"), pFile, Length); // Irritatingly does not return errors
 
+	wxXmlResource::Get()->SetFlags(wxXRC_NO_RELOADING); // reloading fails with assert due to missing timestamps
+
 #if !defined(EXCLUDE_FROM_XARLIB)
 	// Add bitmap extenstions
 	BitmapExtensions.Add(_T("png"));
Index: Trunk/XaraLX/wxOil/oilfiles.cpp
===================================================================
--- Trunk/XaraLX/wxOil/oilfiles.cpp	(revision 1412)
+++ Trunk/XaraLX/wxOil/oilfiles.cpp	(revision 1413)
@@ -259,7 +259,7 @@
 	pStream->Read( MemFile, FileSize );
 	
 	// If we haven't read all the file, we must have failed
-	return wxSTREAM_EOF == pStream->GetLastError();
+	return (pStream->LastRead() == FileSize);
 
 #if 0
 	HRSRC   	hResource;


Xara