[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1158
Date       : Mon May 22 16:12:45 BST 2006

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

Attempt to hide error from commnad line users when launching web browsers.


Diff:
Index: Trunk/XaraLX/wxOil/camprocess.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camprocess.cpp	(revision 1157)
+++ Trunk/XaraLX/wxOil/camprocess.cpp	(revision 1158)
@@ -405,6 +405,9 @@
 {
 	m_ReturnCode = 0;		// Assume success until we find otherwise
 
+	// Make sure redirection happens
+	Redirect();
+
 	TRACEUSER("Phil", _T("Executing %s
"), (LPCTSTR) cmd);
 	m_pid = wxExecute(cmd, wxEXEC_ASYNC, this);
 	if (m_pid==0)
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1157)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1158)
@@ -262,7 +262,7 @@
 		wxObject* pEventObject = event.GetEventObject();
 		if (pEventObject)
 		{
-			TRACEUSER( "jlh92", _T("KeyEvent 4 %s CH
"), 
+			TRACEUSER( "jlh92", _T("KeyEvent 4 %s CH
"),
 				((wxWindow*)pEventObject)->GetClassInfo()->GetClassName() );
 		}
 	}
@@ -278,7 +278,7 @@
 		lLastTimeStamp = event.GetTimestamp();
 
 		wxObject* pEventObject = event.GetEventObject();
-		TRACEUSER( "jlh92", _T("KeyEvent 4 %s %s
"), 
+		TRACEUSER( "jlh92", _T("KeyEvent 4 %s %s
"),
 			((wxWindow*)pEventObject)->GetClassInfo()->GetClassName(),
 			event.GetEventType() == wxEVT_KEY_DOWN ? _T("KD") : _T("KU") );
 		
@@ -1377,7 +1377,7 @@
 	//
 	BOOL ok;
 
-	ok = LaunchBrowserApp(_T("viewhtml"), strUrl);
+	ok = LaunchBrowserApp(_T("htmlview"), strUrl);
 	if (ok) return ok;
 
 	ok = LaunchBrowserApp(_T("firefox"), strUrl);


Xara