[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1122
Date       : Thu May 18 19:21:42 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camelot.cpp
   M /Trunk/XaraLX/wxOil/camelot.h

Primative warning box when the app is about to disappear due to SEGV etc.


Diff:
Index: Trunk/XaraLX/wxOil/camelot.h
===================================================================
--- Trunk/XaraLX/wxOil/camelot.h	(revision 1121)
+++ Trunk/XaraLX/wxOil/camelot.h	(revision 1122)
@@ -144,6 +144,8 @@
 	
 	int /*TYPENOTE: Correct*/ FilterEvent( wxEvent& event );
 
+	void OnFatalException();
+
 protected:
 	std::auto_ptr<wxDocManager> m_docManager;
 	CCamFrame			   *m_pMainFrame;
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1121)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1122)
@@ -362,6 +362,7 @@
 
 bool CCamApp::OnInit()
 {
+	::wxHandleFatalExceptions(TRUE);
 	//
 	// Parse command line. We do this early so we get flags which
 	// are useful for init, such as -u
@@ -824,6 +825,7 @@
 	DeInitUserHelp();
 #endif
 
+	::wxHandleFatalExceptions(FALSE);
 	return wxApp::OnExit();
 }
 
@@ -1598,3 +1600,28 @@
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
+
+
+/*********************************************************************************************
+>	void CCamApp::OnFatalException()
+
+	Author:		Alex Bligh <alex@xxxxxxxxxxx>
+	Created:	09/05/06
+	Inputs:		-
+	Outputs:	-
+	Returns:	-
+	Purpose:	This function is called whenever a fatal exception has occurred
+	Errors:		-
+	Scope:	    Public
+	SeeAlso:	-
+
+**********************************************************************************************/ 
+
+void CCamApp::OnFatalException()
+{
+	DisableSystem();
+	::wxMessageBox(_T("An extremely serious error has occurred. Xara LX must exit immediately"));
+	EnableSystem();
+	return;
+}
+


Xara