diff --git a/ChangeLog b/ChangeLog index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c9ca1ebd2e..7cfa1ff560 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Dec 18 16:15:55 2001 Owen Taylor + + * gdk/gdkgc.h: Explicitely deprecate gdk_gc_set_font() + (reported by Jeff Franks.) + Tue Dec 18 16:07:28 2001 Owen Taylor * gdk/gdkkeys.h (struct _GdkKeymapClass): Fix diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h index 4773b40f37..e21837fad0 100644 --- a/gdk/gdkgc.h +++ b/gdk/gdkgc.h @@ -206,8 +206,10 @@ void gdk_gc_set_foreground (GdkGC *gc, GdkColor *color); void gdk_gc_set_background (GdkGC *gc, GdkColor *color); +#ifndef GDK_DISABLE_DEPRECATED void gdk_gc_set_font (GdkGC *gc, GdkFont *font); +#endif /* GDK_DISABLE_DEPRECATED */ void gdk_gc_set_function (GdkGC *gc, GdkFunction function); void gdk_gc_set_fill (GdkGC *gc,