--- a/graphicsdeviceinterface/gdi/inc/GDI.H	Wed May 19 14:34:22 2010 +0100
+++ b/graphicsdeviceinterface/gdi/inc/GDI.H	Tue Jun 01 15:04:40 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -140,7 +140,12 @@
 	/** Insufficient text for successful completion of the method */
 	EGdiPanic_OutOfText				= 2,
 	/** Internal failure. */
-	EGdiPanic_Invariant				= 3
+	EGdiPanic_Invariant				= 3,
+	/** Reserved panic codes. Not to be used. */
+	EGdiPanic_Reserved1				= 4,
+	EGdiPanic_Reserved2				= 5,
+	/** Setting a typeface name that is too long */
+	EGdiPanic_TypefaceNameOverflow	= 6,
 	};
 
 
@@ -560,6 +565,8 @@
 	IMPORT_C void SetScriptTypeForMetrics(TLanguage aLanguage);
 	IMPORT_C void SetScriptTypeForMetrics(TInt aScript);
 	IMPORT_C TInt ScriptTypeForMetrics() const;
+	IMPORT_C void SetName(const TDesC& aName);
+	IMPORT_C const TDesC& Name() const;
 private:
 	void ResetAttributes();
 	void ResetScriptType();
@@ -2258,14 +2265,16 @@
 	
 	Note:
 	
-	The pen is used to draw lines, the outlines of filled shapes, and text. The 
-	class provides member functions to set the colour of the pen, the style of 
+	The pen is used to draw lines, the outlines of filled shapes, and text. In case
+	of outlined text, the pen is used to draw the outline of the font.
+	
+	The	class provides member functions to set the colour of the pen, the style of 
 	line and the line size drawn.
 	
 	@param aColor An RGB colour for the pen. 
 	@see CGraphicsContext::SetDrawMode() */
 	virtual void SetPenColor(const TRgb& aColor)=0;
-
+ 
 	/** Sets the line drawing style for the pen. 
 	
 	There are 6 pen styles. If no pen style is set, then the default is 
@@ -2351,8 +2360,9 @@
 	
 	Notes:
 	
-	The brush is used for filling shapes and the background of text boxes. The 
-	brush has colour, style, pattern and pattern origin parameters.
+	The brush is used for filling shapes and the background of text boxes. In 
+	case of outlined text, the brush is used for filling the font. The brush 
+	has colour, style, pattern and pattern origin parameters.
 	
 	If no brush colour has been set, it defaults to white. However the default 
 	brush style is null, so when drawing to a window the default appears to be