[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1166
Date       : Mon May 22 21:24:43 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/fontdrop.cpp
   A /Trunk/XaraLX/wxOil/xrc/IDB_UNKNOWNFONT_SYMBOL.png

Made unknown fonts appear with an unknown font symbol


Diff:
Index: Trunk/XaraLX/wxOil/xrc/IDB_UNKNOWNFONT_SYMBOL.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: Trunk/XaraLX/wxOil/xrc/IDB_UNKNOWNFONT_SYMBOL.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: Trunk/XaraLX/wxOil/fontdrop.cpp
===================================================================
--- Trunk/XaraLX/wxOil/fontdrop.cpp	(revision 1165)
+++ Trunk/XaraLX/wxOil/fontdrop.cpp	(revision 1166)
@@ -505,13 +505,13 @@
 		{
 			TRACEUSER("wuerthne", _T("update missing item"));
 			FontDropItem *Item = (FontDropItem*)Fonts.GetTail();
-			Item->SetInfo(NewName, TheFont->Type);
+			Item->SetInfo(NewName, FC_UNDEFINED);
 			SelectedIndex = Index - 1;
 		}
 		else
 		{
 			TRACEUSER("wuerthne", _T("add missing item"));
-			FontDropItem *Item = new FontDropItem(NewName, TheFont->Type);
+			FontDropItem *Item = new FontDropItem(NewName, FC_UNDEFINED);
 			Fonts.AddTail(Item);
 			AddItem((void*) Item);
 			m_MissingItemAdded = TRUE;
@@ -655,6 +655,10 @@
 			BitmapID = _R(IDB_ATM_SYMBOL);
 			break;
 
+		case FC_UNDEFINED:
+			BitmapID = _R(IDB_UNKNOWNFONT_SYMBOL);
+			break;
+
 		default:
 			BitmapID = 0;
 			break;


Xara