Clean-up of the button controller.

[lyx.git] / src / frontends / gnome / gnome_helpers.C

diff --git a/src/frontends/gnome/gnome_helpers.C b/src/frontends/gnome/gnome_helpers.C
index faa4e70678c9005da6b9e761f264de13125f7fa3..e946ebe3b6e1576ddeae2eb54cf1992a3e8bf029 100644 (file)
--- a/src/frontends/gnome/gnome_helpers.C
+++ b/src/frontends/gnome/gnome_helpers.C
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  * 
@@ -26,7 +25,6 @@ string get_font_name(Gdk_Font const & font)
 }
 
 
-extern "C"
 gchar *
 get_font_name (const GdkFont * font)
 {
@@ -45,14 +43,18 @@ get_font_name (const GdkFont * font)
                gint num_fonts;
                gchar **font_names;
 
-               num_fonts = XFontsOfFontSet (XFontSet(GDK_FONT_XFONT (font)), &font_structs, &font_names);
+               num_fonts = XFontsOfFontSet (
+                               static_cast<XFontSet>(GDK_FONT_XFONT (font))
+                               , &font_structs, &font_names);
 #ifdef E_FONT_VERBOSE
                g_print ("Fonts of fontset:\n");
                for (i = 0; i < num_fonts; i++) g_print ("  %s\n", font_names[i]);
 #endif
                status = XGetFontProperty (font_structs[0], font_atom, &atom);
        } else {
-               status = XGetFontProperty ( (XFontStruct*)GDK_FONT_XFONT (font), font_atom, &atom);
+               status = XGetFontProperty ( 
+                               static_cast<XFontStruct*>(GDK_FONT_XFONT (font))
+                               , font_atom, &atom);
        }
 
        if (status) {