[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 789
Date       : Fri Apr  7 12:17:04 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/filtimop.cpp
   M /Trunk/XaraLX/wxOil/camdoc.cpp
   M /Trunk/XaraLX/wxOil/fontbase.cpp

Ben Fowlers warnings (and typo) fixes


Diff:
Index: Trunk/XaraLX/Kernel/filtimop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/filtimop.cpp	(revision 788)
+++ Trunk/XaraLX/Kernel/filtimop.cpp	(revision 789)
@@ -187,10 +187,10 @@
 	m_pthFile=pthFile;
 	m_fInsert=fInsert;
 	m_pfileFile=pfileFile;
-	m_fReportErrors=NULL;
+	m_fReportErrors=0;
 	
 	// init where the graphic is exported to
-	// this makes a reasonable guess but should be set latter
+	// this makes a reasonable guess but should be set later
 	m_GraphicPath = pthFile;
 	m_GraphicPath.SetType("gif");
 }
Index: Trunk/XaraLX/wxOil/fontbase.cpp
===================================================================
--- Trunk/XaraLX/wxOil/fontbase.cpp	(revision 788)
+++ Trunk/XaraLX/wxOil/fontbase.cpp	(revision 789)
@@ -883,8 +883,10 @@
 BOOL FontMetricsCacheEntry::CacheFontMetrics( wxDC* pDC, CharDescription FontDesc,
 												MILLIPOINT DefaultHeight, INT32 DesignSize )
 {
+#ifdef __WXGTK__
 	INT32 Ascent;
 	INT32 Descent;
+#endif
 
 	// these values are ignored - the DesignSize needs to be read from the font, so the
 	// scaling needs to be done by FTFontMan itself
Index: Trunk/XaraLX/wxOil/camdoc.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camdoc.cpp	(revision 788)
+++ Trunk/XaraLX/wxOil/camdoc.cpp	(revision 789)
@@ -1640,6 +1640,7 @@
 #else
 	wxMessageBox( _T("Save functionality has not been implemented yet. Operation not performed."), _T("Unimplemented"),
 		wxOK | wxICON_EXCLAMATION );
+	return false;
 #endif	
 }
 


Xara