Savestates work! Not much else does yet (settings, etc), but at least this monkey's off my back. I can work on tying up more loose ends now. :)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1975 96395faa-99c1-11dd-bbfe-3dabce05a288

common/src/Utilities/Exceptions.cpp

@@ -116,11 +116,23 @@ wxString Exception::BaseException::FormatDiagnosticMessage() const
 	return m_message_diag + L"\n\n" + m_stacktrace;
 }
 
+// ------------------------------------------------------------------------
+wxString Exception::CancelEvent::FormatDiagnosticMessage() const
+{
+	// FIXME: This should probably just log a single line from the stacktrace.. ?
+	return L"Action canceled: " + m_message_diag;
+}
+
+wxString Exception::CancelEvent::FormatDisplayMessage() const
+{
+	return L"Action canceled: " + m_message_diag;
+}
+
 // ------------------------------------------------------------------------
 wxString Exception::ObjectIsNull::FormatDiagnosticMessage() const
 {
 	return wxsFormat(
-		L"An attempted reference to the %s has failed; the frame does not exist or it's handle is null.",
+		L"reference to '%s' failed : handle is null.",
 		m_message_diag.c_str()
 	) + m_stacktrace;
 }
@@ -128,7 +140,7 @@ wxString Exception::ObjectIsNull::FormatDiagnosticMessage() const
 wxString Exception::ObjectIsNull::FormatDisplayMessage() const
 {
 	return wxsFormat(
-		L"An attempted reference to the %s has failed; the frame does not exist or it's handle is null.",
+		L"reference to '%s' failed : handle is null.",
 		m_message_diag.c_str()
 	);
 }