[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1187
Date       : Thu May 25 10:43:37 BST 2006

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

Fix builds without wxDebugReport more cleanly


Diff:
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1186)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1187)
@@ -374,7 +374,7 @@
 		}
 		else if (id == _R(IDS_ERRORBOX_DEBUGREPORT))
 		{
-#if wxUSE_DEBUGREPORT && wxUSE_XML
+#ifdef HAVE_DEBUGREPORT
 			wxDebugReport report;
 			wxDebugReportPreviewStd preview;
 		
@@ -383,6 +383,9 @@
 			if ( preview.Show(report) )
 				report.Process();
 #else
+			// This string is not translatable in case translation errors. Note it should never
+			// appear as the button to call this is disabled where the build does not support
+			// debug reports.
 			::wxMessageBox(_T("Your build was not compiled to support debug reports"));
 #endif
 		}
@@ -612,6 +615,14 @@
 				delete pBox;
 				return OK;
 			}
+
+#ifndef HAVE_DEBUGREPORT
+			if (butt==6)
+			{
+				pButt[butt]->Enable(FALSE);
+			}
+#endif
+
 		}
 		else
 			pButt[butt]=NULL;
Index: Trunk/XaraLX/wxOil/stdwx.h
===================================================================
--- Trunk/XaraLX/wxOil/stdwx.h	(revision 1186)
+++ Trunk/XaraLX/wxOil/stdwx.h	(revision 1187)
@@ -179,6 +179,12 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 
+#if wxUSE_DEBUGREPORT && wxUSE_XML
+#define HAVE_DEBUGREPORT
+#else
+#undef HAVE_DEBUGREPORT
+#endif
+
 template< typename T >
 T Abs( T val )
 {
@@ -217,3 +223,4 @@
 #include "exception.h"
 #include "mfccontainer.h"
 #include "binreloc.h"
+


Xara