[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : gerry
Repository : xara
Revision   : 1186
Date       : Thu May 25 10:04:13 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/errors.cpp

Tweak for building Xarlib


Diff:
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1185)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1186)
@@ -108,10 +108,10 @@
 #include "errors.h"
 #include "camelot.h"
 #include "strings.h"
-#include "tool.h"
 #include "basestr.h"
 #include "ensure.h"
 #if !defined(EXCLUDE_FROM_XARLIB)
+#include "tool.h"
 #include "helpuser.h"
 #include "basebar.h"		// For gallery creation error box fix...
 #include "ralphint.h"
@@ -152,6 +152,7 @@
 
 wxString Error::UserName;
 
+#if !defined(EXCLUDE_FROM_XARLIB)
 /********************************************************************************************
 
 >	ErrorInfo::ErrorInfo()
@@ -174,6 +175,7 @@
 	Cancel    = 2;
 	Help      = 0;				// by default there is no help button
 }
+#endif
 
 /********************************************************************************************
 
@@ -957,15 +959,16 @@
 	
 	TRACE( _T("Setting error: ID = %d: \"%s\"
"), ErrorID, ErrorString);
 	InSetError--;
-}                          
+}
 
+#if !defined(EXCLUDE_FROM_XARLIB)
 void Error::SetErrorTool(UINT32 number, UINT32 toolID)
 {
 	Error::SetError(number, Tool::GetModuleID(toolID));
 }
+#endif
 
 
-
 /********************************************************************************************
 
 >	static void Error::ClearError()


Xara