diff --git a/ChangeLog b/ChangeLog index 003ddd9a0b..143830a19f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-01-31 Matthias Clasen + * gdk/gdkpixbuf.h: + * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): + (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) + + * gtk/gtkcolorsel.h: + * gtk/gtkcolorsel.c (gtk_color_selection_set_change_palette_hook): + Deprecate. (#98167) + * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077) * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 003ddd9a0b..143830a19f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,13 @@ 2003-01-31 Matthias Clasen + * gdk/gdkpixbuf.h: + * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): + (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) + + * gtk/gtkcolorsel.h: + * gtk/gtkcolorsel.c (gtk_color_selection_set_change_palette_hook): + Deprecate. (#98167) + * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077) * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 003ddd9a0b..143830a19f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,13 @@ 2003-01-31 Matthias Clasen + * gdk/gdkpixbuf.h: + * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): + (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) + + * gtk/gtkcolorsel.h: + * gtk/gtkcolorsel.c (gtk_color_selection_set_change_palette_hook): + Deprecate. (#98167) + * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077) * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 003ddd9a0b..143830a19f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,13 @@ 2003-01-31 Matthias Clasen + * gdk/gdkpixbuf.h: + * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): + (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) + + * gtk/gtkcolorsel.h: + * gtk/gtkcolorsel.c (gtk_color_selection_set_change_palette_hook): + Deprecate. (#98167) + * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077) * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 003ddd9a0b..143830a19f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,13 @@ 2003-01-31 Matthias Clasen + * gdk/gdkpixbuf.h: + * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): + (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) + + * gtk/gtkcolorsel.h: + * gtk/gtkcolorsel.c (gtk_color_selection_set_change_palette_hook): + Deprecate. (#98167) + * gtk/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077) * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c index ef920b8b66..8095188d95 100644 --- a/gdk/gdkpixbuf-render.c +++ b/gdk/gdkpixbuf-render.c @@ -164,7 +164,7 @@ gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, * for consistent visual results. If you do not have any of these cases, the * dither offsets can be both zero. * - * This function is obsolete. Use gdk_draw_pixbuf() instead. + * Deprecated: This function is obsolete. Use gdk_draw_pixbuf() instead. **/ void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, @@ -207,7 +207,7 @@ gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, * On older X servers, rendering pixbufs with an alpha channel involves round trips * to the X server, and may be somewhat slow. * - * This function is obsolete. Use gdk_draw_pixbuf() instead. + * Deprecated: This function is obsolete. Use gdk_draw_pixbuf() instead. **/ void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, @@ -238,8 +238,7 @@ gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, * and @mask_return arguments, respectively, and renders a pixbuf and its * corresponding thresholded alpha mask to them. This is merely a convenience * function; applications that need to render pixbufs with dither offsets or to - * given drawables should use gdk_pixbuf_render_to_drawable_alpha() or - * gdk_pixbuf_render_to_drawable(), and gdk_pixbuf_render_threshold_alpha(). + * given drawables should use gdk_draw_pixbuf() and gdk_pixbuf_render_threshold_alpha(). * * The pixmap that is created is created for the colormap returned * by gdk_rgb_get_colormap(). You normally will want to instead use @@ -275,8 +274,7 @@ gdk_pixbuf_render_pixmap_and_mask (GdkPixbuf *pixbuf, * and @mask_return arguments, respectively, and renders a pixbuf and its * corresponding tresholded alpha mask to them. This is merely a convenience * function; applications that need to render pixbufs with dither offsets or to - * given drawables should use gdk_pixbuf_render_to_drawable_alpha() or - * gdk_pixbuf_render_to_drawable(), and gdk_pixbuf_render_threshold_alpha(). + * given drawables should use gdk_draw_pixbuf(), and gdk_pixbuf_render_threshold_alpha(). * * The pixmap that is created uses the #GdkColormap specified by @colormap. * This colormap must match the colormap of the window where the pixmap @@ -308,11 +306,11 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, gdk_drawable_set_colormap (GDK_DRAWABLE (*pixmap_return), colormap); gc = gdk_gc_new (*pixmap_return); - gdk_pixbuf_render_to_drawable (pixbuf, *pixmap_return, gc, - 0, 0, 0, 0, - gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), - GDK_RGB_DITHER_NORMAL, - 0, 0); + gdk_draw_pixbuf (*pixmap_return, gc, pixbuf, + 0, 0, 0, 0, + gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), + GDK_RGB_DITHER_NORMAL, + 0, 0); g_object_unref (gc); } diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index 74bc5f3469..39c33d240d 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -20,6 +20,7 @@ void gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf, int width, int height, int alpha_threshold); +#ifndef GDK_DISABLE_DEPRECATED void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, GdkDrawable *drawable, GdkGC *gc, @@ -45,7 +46,7 @@ void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, GdkRgbDither dither, int x_dither, int y_dither); - +#endif /* GDK_DISABLE_DEPRECATED */ void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, GdkColormap *colormap, GdkPixmap **pixmap_return, diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index e0c1d8f70a..f37b09cead 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -2250,7 +2250,7 @@ gtk_color_selection_set_current_alpha (GtkColorSelection *colorsel, * Sets the current color to be @color. The first time this is called, it will * also set the original color to be @color too. * - * This function is deprecated, use gtk_color_selection_set_current_color() instead. + * Deprecated: Use gtk_color_selection_set_current_color() instead. **/ void gtk_color_selection_set_color (GtkColorSelection *colorsel, @@ -2681,11 +2681,12 @@ gtk_color_selection_palette_to_string (const GdkColor *colors, * the new palette contents, and update the GtkSettings property * "gtk-color-palette" so all GtkColorSelection widgets will be modified. * - * This function is deprecated in favor of + * Return value: the previous change palette hook (that was replaced). + * + * Deprecated: This function is deprecated in favor of * gtk_color_selection_set_change_palette_with_screen_hook(), and does * not work in multihead environments. * - * Return value: the previous change palette hook (that was replaced). **/ GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func) diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index ace6aa33b3..4057ea353f 100644 --- a/gtk/gtkcolorsel.h +++ b/gtk/gtkcolorsel.h @@ -110,9 +110,11 @@ gboolean gtk_color_selection_palette_from_string (const gchar *str, gchar* gtk_color_selection_palette_to_string (const GdkColor *colors, gint n_colors); +#ifndef GTK_DISABLE_DEPRECATED #ifndef GDK_MULTIHEAD_SAFE GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func); #endif +#endif GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);