summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-08-23 15:26:49 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-08-23 15:26:49 +0000
commita2d60d44b170d403f26444081113be8d60afe8a3 (patch)
treeda9506d74a6edba8c3fc4232b350eb3263df95b5 /gtk/gtklabel.h
parent34852377443196c3b2b6affd18e3ad7f5400cea8 (diff)
downloadgtk+-a2d60d44b170d403f26444081113be8d60afe8a3.tar.gz
[ Patch from Sebastian Wilhelmi, 52790 ]
Wed Aug 22 19:15:39 2001 Owen Taylor <otaylor@redhat.com> [ Patch from Sebastian Wilhelmi, 52790 ] * gtk/gtkversion.h.in gtk/gtk.h: New file replacing gtkcompat.h * gdk/gdkcompat.h gdk/gdk*.h gtk/gtkcompat.h.in gtk/gtk*.h: Move compatibility macros from g[dt]kcompat.h to within #ifndef G[DT]K_DISABLE_DEPRECATED in each file. * gdk/gdk-pixbuf-csource.c: Fix up include of gtkcompat.h. * demos/Makefile.am demos/gtk-demo/Makefile.am docs/reference/gdk-pixbuf/Makefile.am modules/input/Makefile.am tests/Makefile.am: Remove references to -G[DT]K_DISABLE_DEPRECATED. * demos/{pixbuf-demo.c,testpixbuf-drawable.c,testpixbuf-save.c, testpixbuf.c}: Fix usages of deprecated functions.
Diffstat (limited to 'gtk/gtklabel.h')
-rw-r--r--gtk/gtklabel.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 5ba51e54fe..03524a3b28 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -133,12 +133,9 @@ void gtk_label_get_layout_offsets (GtkLabel *label,
gint *y);
-#ifndef GTK_DISABLE_COMPAT_H
-# define gtk_label_set gtk_label_set_text
-#endif /* GTK_DISABLE_COMPAT_H */
-
#ifndef GTK_DISABLE_DEPRECATED
-/* Deprecated */
+
+#define gtk_label_set gtk_label_set_text
void gtk_label_get (GtkLabel *label,
char **str);