summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1999-01-15 18:41:43 +0000
committerTim Janik <timj@src.gnome.org>1999-01-15 18:41:43 +0000
commit87620764ae76d0ce518ca30f8ed19c60e2fdbfec (patch)
treec138e6f62d12d65e80e7e9ff801507e91503c487 /gtk/gtklabel.h
parent2e99e7713dc73ea5b7a000ab03b4d64176b9ad40 (diff)
downloadgtk+-87620764ae76d0ce518ca30f8ed19c60e2fdbfec.tar.gz
define GTK_DISABLE_COMPAT_H for compilation of gtk code.
Fri Jan 15 19:16:42 1999 Tim Janik <timj@gtk.org> * gtk/Makefile.am: define GTK_DISABLE_COMPAT_H for compilation of gtk code. * gtk/gtkrc.c (gtk_rc_style_unref): added an assertment. * gtk/gtkcompat.h: * gtk/gtklabel.h: don't provide compatibility defines if GTK_DISABLE_COMPAT_H is defined. * gtk/gtkstyle.h: * gtk/gtkstyle.c: coding style, indentation and alignment fixups. (gtk_draw_string): (gtk_paint_string): (gtk_draw_polygon): (gtk_style_set_background): fixed assertments. (gtk_default_draw_ramp): (gtk_default_draw_cross): (gtk_default_draw_oval): issue warnings since these functions aren't yet implemented. * gdk/gdkwindow.c: (gdk_window_hide): only unmap window if already mapped. (gdk_window_show): only map window if !mapped. (gdk_window_internal_destroy): destroyed windows can't be mapped. * gtk/gtkwidget.c (gtk_widget_event): don't ignore expose events just because a resize is queued on a widget, we rely on the expose events now.
Diffstat (limited to 'gtk/gtklabel.h')
-rw-r--r--gtk/gtklabel.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 9f839e8734..54bf4d70b1 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -82,8 +82,9 @@ void gtk_label_get (GtkLabel *label,
guint gtk_label_parse_uline (GtkLabel *label,
const gchar *string);
-/* Deprecated */
-#define gtk_label_set gtk_label_set_text
+#ifndef GTK_DISABLE_COMPAT_H
+# define gtk_label_set gtk_label_set_text
+#endif /* GTK_DISABLE_COMPAT_H */
#ifdef __cplusplus
}