summaryrefslogtreecommitdiff
path: root/gdk/gdkfont.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@src.gnome.org>2000-03-14 19:57:25 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-03-14 19:57:25 +0000
commit10ba4fd066042b4335ae45e7560565872f71ba9b (patch)
tree17f68ffb0d402b6e66bb891d4a7d9a02a9b6108b /gdk/gdkfont.h
parent3f98a849c70ae570b78095cef0152a33ec07c64e (diff)
downloadgtk+-10ba4fd066042b4335ae45e7560565872f71ba9b.tar.gz
Merges from gtk-1-2
Diffstat (limited to 'gdk/gdkfont.h')
-rw-r--r--gdk/gdkfont.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/gdkfont.h b/gdk/gdkfont.h
index fab92938f0..213c545d0f 100644
--- a/gdk/gdkfont.h
+++ b/gdk/gdkfont.h
@@ -25,11 +25,11 @@ struct _GdkFont
};
GdkFont* gdk_font_load (const gchar *font_name);
-GdkFont* gdk_fontset_load (gchar *fontset_name);
+GdkFont* gdk_fontset_load (const gchar *fontset_name);
GdkFont* gdk_font_ref (GdkFont *font);
void gdk_font_unref (GdkFont *font);
gint gdk_font_id (const GdkFont *font);
-gint gdk_font_equal (const GdkFont *fonta,
+gboolean gdk_font_equal (const GdkFont *fonta,
const GdkFont *fontb);
gint gdk_string_width (GdkFont *font,