Merges from gtk-1-2

This commit is contained in:
Owen Taylor
2000-03-14 19:57:25 +00:00
parent 3f98a849c7
commit 10ba4fd066
98 changed files with 3772 additions and 1749 deletions

View File

@ -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,