[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1568
Date       : Thu Jul 27 14:03:39 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/txtattr.cpp

MartinW's fix for text attribute reporting in the debug tree


Diff:
Index: Trunk/XaraLX/Kernel/txtattr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/txtattr.cpp	(revision 1567)
+++ Trunk/XaraLX/Kernel/txtattr.cpp	(revision 1568)
@@ -4055,11 +4055,11 @@
 		}
 		
 		(*Str) += buf;
-		camSnprintf( buf, 255, _T("Bold = %s
"), Value.IsBold ? "TRUE":"FALSE");
+		camSnprintf( buf, 255, _T("Bold = %s
"), Value.IsBold ? _T("TRUE"):_T("FALSE"));
 		(*Str) += buf;
-		camSnprintf( buf, 255, _T("Italic = %s
"), Value.IsItalic ? "TRUE":"FALSE");
+		camSnprintf( buf, 255, _T("Italic = %s
"), Value.IsItalic ? _T("TRUE"):_T("FALSE"));
 		(*Str) += buf;	
-		camSnprintf( buf, 255, _T("Replaced = %s
"), FONTMANAGER->IsFontReplaced(&FontName, Class) ? "TRUE":"FALSE");
+		camSnprintf( buf, 255, _T("Replaced = %s
"), FONTMANAGER->IsFontReplaced(&FontName, Class) ? _T("TRUE"):_T("FALSE"));
 		(*Str) += buf;	
 	}
 }
@@ -4342,9 +4342,9 @@
 	NodeAttribute::GetDebugDetails( Str );
 
 	String_256 TempStr;
-	char* p;
+	TCHAR* p;
 
-	(Value.BoldOn) ? (p = "TRUE") : (p = "FALSE");
+	(Value.BoldOn) ? (p = _T("TRUE")) : (p = _T("FALSE"));
 	TempStr._MakeMsg( TEXT("
Bold=#1%s
"), p);
 	(*Str) += TempStr;
 }
@@ -4627,9 +4627,9 @@
 	NodeAttribute::GetDebugDetails( Str );
 
 	String_256 TempStr;
-	char* p;
+	TCHAR* p;
 
-	(Value.ItalicOn) ? (p = "TRUE") : (p = "FALSE");
+	(Value.ItalicOn) ? (p = _T("TRUE")) : (p = _T("FALSE"));
 	TempStr._MakeMsg( TEXT("
Italic=#1%s
"), p);
 	(*Str) += TempStr;
 }
@@ -5211,8 +5211,8 @@
 	NodeAttribute::GetDebugDetails( Str );
 
 	String_256 TempStr;
-	char* p;
-	(Value.Underlined) ? (p="TRUE") : (p="FALSE");
+	TCHAR* p;
+	(Value.Underlined) ? (p=_T("TRUE")) : (p=_T("FALSE"));
 	TempStr._MakeMsg( TEXT("
Underline=#1%s
"), p);
 	(*Str) += TempStr;
 }


Xara