[XaraXtreme-dev] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 689
Date       : Sat Mar 18 20:24:02 GMT 2006

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

Made GetSvnVersion conditional code take __WXMAC__ into account to match current libCDraw.a universal binary.


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 688)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 689)
@@ -298,7 +298,7 @@
 	{
 		wxString			strMessage;
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
 		strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%d
"), 
 			g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
Index: Trunk/XaraLX/wxOil/camframe.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camframe.cpp	(revision 688)
+++ Trunk/XaraLX/wxOil/camframe.cpp	(revision 689)
@@ -705,7 +705,7 @@
 {
 	wxString			strMessage;
 
-#if defined(__WXMSW__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
 	strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%d
Usage: XaraLX.exe [xar-file...]"), 
 		g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
Index: Trunk/XaraLX/GDraw/gdraw.h
===================================================================
--- Trunk/XaraLX/GDraw/gdraw.h	(revision 688)
+++ Trunk/XaraLX/GDraw/gdraw.h	(revision 689)
@@ -152,7 +152,7 @@
 extern "C"
 {
 	extern DWORD GDraw_GetVersion() ;
-#if !defined(__WXMSW__)
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
 	extern pcCHAR GDraw_GetSvnVersion() ;
 #endif
 


Xara