[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1208
Date       : Mon May 29 20:58:12 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/rechdoc.cpp
   M /Trunk/XaraLX/wxOil/basestr.cpp
   M /Trunk/XaraLX/wxOil/basestr.h
   M /Trunk/XaraLX/wxOil/camelot.cpp

Minor changes to aid Mac compilation.


Diff:
Index: Trunk/XaraLX/Kernel/rechdoc.cpp
===================================================================
--- Trunk/XaraLX/Kernel/rechdoc.cpp	(revision 1207)
+++ Trunk/XaraLX/Kernel/rechdoc.cpp	(revision 1208)
@@ -905,7 +905,8 @@
 				String_256 Prefix( _("Imported ") );
 
 				// Does the name already have the prefix string embedded in it?
-				if (cc_lstristr(Name,Prefix) == NULL)
+//				if (cc_lstristr(Name,Prefix) == NULL)
+				if (Name.Sub(Prefix) == 0)
 				{
 					// If not, append the prefix to the original name, and try again
 					Prefix += Name;
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1207)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1208)
@@ -414,7 +414,7 @@
 	{
 		wxString			strMessage;
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__)
 		strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
"), 
 			g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
@@ -968,7 +968,7 @@
 {
 	wxString			strMessage;
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__)
 	strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"), 
 		g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
 #else
@@ -1876,7 +1876,9 @@
 		recursionguard--;
 	
 		// Zap out main loop pointer
+#if !defined(__WXMAC__)
 		m_mainLoop=NULL;
+#endif
 
 	} while(0);
 	
Index: Trunk/XaraLX/wxOil/basestr.h
===================================================================
--- Trunk/XaraLX/wxOil/basestr.h	(revision 1207)
+++ Trunk/XaraLX/wxOil/basestr.h	(revision 1208)
@@ -307,9 +307,9 @@
 // strncpy() doesn't give quite the same results, so we must provide our own.
 TCHAR* cc_camStrncpy(TCHAR* dest, const TCHAR* src, size_t n);
 const TCHAR* cc_lstrstr(const TCHAR* String1, const TCHAR *String2);
-TCHAR* cc_lstristr(TCHAR* String1, TCHAR* String2);
+//TCHAR* cc_lstristr(LPCTSTR String1, LPCTSTR String2);
 TCHAR* cc_lstrchr(TCHAR* Src, TCHAR c);
-TCHAR* cc_lstrichr(TCHAR* String1, TCHAR c);
+//TCHAR* cc_lstrichr(TCHAR* String1, TCHAR c);
 TCHAR* cc_lstrrchr(TCHAR* Src, TCHAR c);
 TCHAR* cc_lstrtok(TCHAR* String1, TCHAR* String2);
 INT32 cc_lstrncmp(TCHAR* String1, TCHAR* String2, INT32 Count);
Index: Trunk/XaraLX/wxOil/basestr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/basestr.cpp	(revision 1207)
+++ Trunk/XaraLX/wxOil/basestr.cpp	(revision 1208)
@@ -1662,7 +1662,7 @@
 
 /**************************************************************************************
 
->	TCHAR* cc_lstristr(TCHAR *String1, TCHAR *String2)
+>	TCHAR* cc_lstristr(LPCTSTR String1, LPCTSTR *String2)
 
 	Author:		Richard_Millican (Xara Group Ltd) <camelotdev@xxxxxxxx>
 	Created:	21st November 1995
@@ -1680,7 +1680,7 @@
 
 ***************************************************************************************/
 
-TCHAR* cc_lstristr(TCHAR *String1, TCHAR *String2)
+/*TCHAR* cc_lstristr(LPCTSTR String1, LPCTSTR String2)
 {
 #if !defined(__WXMSW__)
 	return wcsstr( String1, String2 );
@@ -1714,9 +1714,9 @@
 	return(0);
 #endif
 }
+*/
 
 
-
 /**************************************************************************************
 
 >	TCHAR* cc_lstrichr(TCHAR *Str, TCHAR c)
@@ -1738,7 +1738,7 @@
 
 ***************************************************************************************/
 
-TCHAR* cc_lstrichr(TCHAR *Str, TCHAR c)
+/*TCHAR* cc_lstrichr(TCHAR *Str, TCHAR c)
 {
 #if !defined(__WXMSW__)
 	return wcschr( Str, c );
@@ -1761,3 +1761,4 @@
     return(0);
 #endif
 }
+*/


Xara