[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1083
Date       : Tue May 16 16:19:48 BST 2006

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

Manually expand newline escape sequences in InformGeneral to improve presentation of messages.


Diff:
Index: Trunk/XaraLX/wxOil/errors.cpp
===================================================================
--- Trunk/XaraLX/wxOil/errors.cpp	(revision 1082)
+++ Trunk/XaraLX/wxOil/errors.cpp	(revision 1083)
@@ -524,11 +524,15 @@
 		pMessageSizer->Add(pStaticBitmap, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 	}
 
+	// Perform manual expansion of newline escape sequences...
+	wxString temp = (TCHAR *)Error::GetErrorString();
+	temp.Replace(_T("\n"), _T("
"), TRUE);
+
     //wxTextCtrl* pMessage = new wxTextCtrl( pBox, -1, (TCHAR *)Error::GetErrorString(),
 	//									   wxDefaultPosition, wxSize(400, -1),
 	//									   wxTE_MULTILINE|wxTE_READONLY|wxTE_CENTRE|wxNO_BORDER );
 
-	wxStaticText* pMessage = new wxStaticText( pBox, -1, (TCHAR *)Error::GetErrorString(),
+	wxStaticText* pMessage = new wxStaticText( pBox, -1, temp,
 										   wxDefaultPosition, wxSize(400, -1),
 										   wxALIGN_CENTRE|wxNO_BORDER );
 	if (!pMessage)


Xara