(bstell speaking, cell (415) 845-7800)

for bug 46974 we changed the type for nsFontHandle; make corresponding
changes here

bug 46974 - display of ascii (8 bit) data incorrect with 10646 (16 bit) font
a=erik r=blizzard, approved for trunk checkin by jar

widget/src/gtk/Makefile.in

@@ -97,6 +97,7 @@ endif
 INCLUDES	+= \
 		-I$(srcdir)/../xpwidgets \
 		-I$(srcdir) \
+		-I$(topsrcdir)/gfx/src/gtk \
 		$(NULL)
 
 ICON_FILES	= \

widget/src/gtk/nsWidget.cpp

@@ -37,6 +37,7 @@
 #include "nsIServiceManager.h"
 #include "nsIDragSessionGTK.h"
 #include "nsIDragService.h"
+#include "nsFontMetricsGTK.h"
 
 #include "nsGtkUtils.h" // for nsGtkUtils::gdk_keyboard_get_modifiers()
 
@@ -756,15 +757,22 @@ NS_IMETHODIMP nsWidget::SetFont(const nsFont &aFont)
 
   nsFontHandle fontHandle;
   fontMetrics->GetFontHandle(fontHandle);
+  nsFontGTK *gtkfontHandle = (nsFontGTK *)fontHandle;
+
+  GdkFont *gdk_font = nsnull;
   if (fontHandle) {
+      gdk_font = gtkfontHandle->GetGDKFont();
+  }
+
+  if (gdk_font) {
     // FIXME avoid fontset problems....
-    if (((GdkFont*)fontHandle)->type == GDK_FONT_FONTSET) {
+    if (gdk_font->type == GDK_FONT_FONTSET) {
       g_print("nsWidget:SetFont - got a FontSet.. ignoring\n");
       return NS_ERROR_FAILURE;
     }
 
     if (mWidget) 
-      SetFontNative((GdkFont *)fontHandle);
+      SetFontNative(gdk_font);
   }
 
   return NS_OK;