Index: ChangeLog
===================================================================
--- ChangeLog	(revision 75291)
+++ ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2007-04-02  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* XplatUIOSX.cs, XplatUIX11.cs, XplatUIX11GTK.cs: Remove dependency
+	on an internal libgdiplus call when the information is already 
+	available via the public API.
+
 2007-04-02  Rolf Bjarne Kvinge <RKvinge@novell.com> 
 
 	* Control.cs: Call ContainerControl.ChildControlRemoved whenever a
Index: XplatUIX11GTK.cs
===================================================================
--- XplatUIX11GTK.cs	(revision 75291)
+++ XplatUIX11GTK.cs	(working copy)
@@ -4503,9 +4503,6 @@
 		[DllImport ("libX11", EntryPoint="XDeleteProperty")]
 		internal extern static int XDeleteProperty (IntPtr display, IntPtr window, int property);
 		
-		[DllImport ("gdiplus", EntryPoint="GetFontMetrics")]
-		internal extern static bool GetFontMetrics (IntPtr graphicsObject, IntPtr nativeObject, out int ascent, out int descent);
-		
 		// Drawing
 		[DllImport ("libX11", EntryPoint="XCreateGC")]
 		internal extern static IntPtr XCreateGC (IntPtr display, IntPtr window, GCFunction valuemask, ref XGCValues values);
Index: XplatUIX11.cs
===================================================================
--- XplatUIX11.cs	(revision 75291)
+++ XplatUIX11.cs	(working copy)
@@ -3362,7 +3362,10 @@
 
 
 		internal override bool GetFontMetrics(Graphics g, Font font, out int ascent, out int descent) {
-			return GetFontMetrics(g.GetHdc(), font.ToHfont(), out ascent, out descent);
+			FontFamily ff = font.FontFamily;
+			ascent = ff.GetCellAscent (font.Style);
+			descent = ff.GetCellDescent (font.Style);
+			return true;
 		}
 
 		internal override Point GetMenuOrigin(IntPtr handle) {
@@ -5679,9 +5682,6 @@
 		[DllImport ("libX11", EntryPoint="XDeleteProperty")]
 		internal extern static int XDeleteProperty(IntPtr display, IntPtr window, IntPtr property);
 
-		[DllImport ("gdiplus", EntryPoint="GetFontMetrics")]
-		internal extern static bool GetFontMetrics(IntPtr graphicsObject, IntPtr nativeObject, out int ascent, out int descent);
-
 		// Drawing
 		[DllImport ("libX11", EntryPoint="XCreateGC")]
 		internal extern static IntPtr XCreateGC(IntPtr display, IntPtr window, IntPtr valuemask, ref XGCValues values);
Index: XplatUIOSX.cs
===================================================================
--- XplatUIOSX.cs	(revision 75291)
+++ XplatUIOSX.cs	(working copy)
@@ -1193,7 +1193,10 @@
 
 		
 		internal override bool GetFontMetrics(Graphics g, Font font, out int ascent, out int descent) {
-			return GetFontMetrics(g.GetHdc(), font.ToHfont(), out ascent, out descent);
+			FontFamily ff = font.FontFamily;
+			ascent = ff.GetCellAscent (font.Style);
+			descent = ff.GetCellDescent (font.Style);
+			return true;
 		}
 		
 		[MonoTODO]
@@ -2136,9 +2139,6 @@
 		[DllImport("/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon")]
 		internal extern static void SetThemeCursor (uint inCursor);
 		#endregion
-
-		[DllImport ("gdiplus", EntryPoint="GetFontMetrics")]
-		internal extern static bool GetFontMetrics(IntPtr graphicsObject, IntPtr nativeObject, out int ascent, out int descent);
 	}
 
 }