[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1559
Date       : Wed Jul 26 17:41:04 BST 2006

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

Removed 'linux edition' from wxOil/camelot.cpp as per NeilH, so works on FreeBSD & Mac (including some from inside #ifdef __WXMSW__ )


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1558)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1559)
@@ -463,7 +463,7 @@
 		wxString			strMessage;
 
 #if defined(__WXMSW__)
-		strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s
CDraw Version: %d.%03d
"), 
+		strMessage = wxString::Format( wxT("Xara Xtreme
Version: %s
CDraw Version: %d.%03d
"), 
 			g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
 #if FALSE == wxUSE_UNICODE
@@ -472,7 +472,7 @@
 		TCHAR			pszCDrawVer[32];
 		camMbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
 #endif
-		strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
"), 
+		strMessage = wxString::Format( wxT("Xara Xtreme
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
"), 
 			g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, CAMELOT_BUILD_DATE );
 #endif
 
@@ -1065,7 +1065,7 @@
 	wxString			strMessage;
 
 #if defined(__WXMSW__)
-	strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"), 
+	strMessage = wxString::Format( wxT("Xara Xtreme
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"), 
 		g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
 #if FALSE == wxUSE_UNICODE
@@ -1074,7 +1074,7 @@
 	TCHAR			pszCDrawVer[32];
 	camMbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
 #endif
-	strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
Built against: " wxVERSION_STRING "
" /*"wxWidgets linked to %s
" */ "Usage: XaraLX [xar-file...]"), 
+	strMessage = wxString::Format( wxT("Xara Xtreme
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
Built against: " wxVERSION_STRING "
" /*"wxWidgets linked to %s
" */ "Usage: XaraLX [xar-file...]"), 
 		g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, CAMELOT_BUILD_DATE /*,_T("Unknown")*/ );
 #endif
 


Xara