AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate. (#60582)

Browse Source 
2003-01-31  Matthias Clasen  <maclas@gmx.de>

	* 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)
This commit is contained in:
Matthias Clasen 2003-01-31 00:37:38 +00:00 committed by Matthias Clasen
parent 2435e831cf
commit 46d15e32bd
9 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2003-01-31 Matthias Clasen <maclas@gmx.de> 2003-01-31 Matthias Clasen <maclas@gmx.de>
* 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/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*

8
ChangeLog.pre-2-10
View File

@ -1,5 +1,13 @@
2003-01-31 Matthias Clasen <maclas@gmx.de> 2003-01-31 Matthias Clasen <maclas@gmx.de>
* 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/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*

8
ChangeLog.pre-2-4
View File

@ -1,5 +1,13 @@
2003-01-31 Matthias Clasen <maclas@gmx.de> 2003-01-31 Matthias Clasen <maclas@gmx.de>
* 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/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*

8
ChangeLog.pre-2-6
View File

@ -1,5 +1,13 @@
2003-01-31 Matthias Clasen <maclas@gmx.de> 2003-01-31 Matthias Clasen <maclas@gmx.de>
* 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/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*

8
ChangeLog.pre-2-8
View File

@ -1,5 +1,13 @@
2003-01-31 Matthias Clasen <maclas@gmx.de> 2003-01-31 Matthias Clasen <maclas@gmx.de>
* 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/gtkpaned.h: Deprecate gtk_paned_computed_position(). (#97077)
* gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_* * gtk/gtkmain.h: Deprecate the gtk_timeout_*, gtk_idle_*

12
gdk/gdkpixbuf-render.c
View File

@ -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 * for consistent visual results. If you do not have any of these cases, the
* dither offsets can be both zero. * 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 void
gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, 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 * On older X servers, rendering pixbufs with an alpha channel involves round trips
* to the X server, and may be somewhat slow. * 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 void
gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf, 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 * and @mask_return arguments, respectively, and renders a pixbuf and its
* corresponding thresholded alpha mask to them. This is merely a convenience * corresponding thresholded alpha mask to them. This is merely a convenience
* function; applications that need to render pixbufs with dither offsets or to * function; applications that need to render pixbufs with dither offsets or to
* given drawables should use gdk_pixbuf_render_to_drawable_alpha() or * given drawables should use gdk_draw_pixbuf() and gdk_pixbuf_render_threshold_alpha().
* gdk_pixbuf_render_to_drawable(), and gdk_pixbuf_render_threshold_alpha().
* *
* The pixmap that is created is created for the colormap returned * The pixmap that is created is created for the colormap returned
* by gdk_rgb_get_colormap(). You normally will want to instead use * 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 * and @mask_return arguments, respectively, and renders a pixbuf and its
* corresponding tresholded alpha mask to them. This is merely a convenience * corresponding tresholded alpha mask to them. This is merely a convenience
* function; applications that need to render pixbufs with dither offsets or to * function; applications that need to render pixbufs with dither offsets or to
* given drawables should use gdk_pixbuf_render_to_drawable_alpha() or * given drawables should use gdk_draw_pixbuf(), and gdk_pixbuf_render_threshold_alpha().
* gdk_pixbuf_render_to_drawable(), and gdk_pixbuf_render_threshold_alpha().
* *
* The pixmap that is created uses the #GdkColormap specified by @colormap. * The pixmap that is created uses the #GdkColormap specified by @colormap.
* This colormap must match the colormap of the window where the pixmap * This colormap must match the colormap of the window where the pixmap
@ -308,7 +306,7 @@ gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
gdk_drawable_set_colormap (GDK_DRAWABLE (*pixmap_return), colormap); gdk_drawable_set_colormap (GDK_DRAWABLE (*pixmap_return), colormap);
gc = gdk_gc_new (*pixmap_return); gc = gdk_gc_new (*pixmap_return);
gdk_pixbuf_render_to_drawable (pixbuf, *pixmap_return, gc, gdk_draw_pixbuf (*pixmap_return, gc, pixbuf,
0, 0, 0, 0, 0, 0, 0, 0,
gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf), gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf),
GDK_RGB_DITHER_NORMAL, GDK_RGB_DITHER_NORMAL,

3
gdk/gdkpixbuf.h
View File

@ -20,6 +20,7 @@ void gdk_pixbuf_render_threshold_alpha (GdkPixbuf *pixbuf,
int width, int width,
int height, int height,
int alpha_threshold); int alpha_threshold);
#ifndef GDK_DISABLE_DEPRECATED
void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, void gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf,
GdkDrawable *drawable, GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,
@ -45,7 +46,7 @@ void gdk_pixbuf_render_to_drawable_alpha (GdkPixbuf *pixbuf,
GdkRgbDither dither, GdkRgbDither dither,
int x_dither, int x_dither,
int y_dither); int y_dither);
#endif /* GDK_DISABLE_DEPRECATED */
void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf, void gdk_pixbuf_render_pixmap_and_mask_for_colormap (GdkPixbuf *pixbuf,
GdkColormap *colormap, GdkColormap *colormap,
GdkPixmap **pixmap_return, GdkPixmap **pixmap_return,

7
gtk/gtkcolorsel.c
View File

@ -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 * Sets the current color to be @color. The first time this is called, it will
* also set the original color to be @color too. * 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 void
gtk_color_selection_set_color (GtkColorSelection *colorsel, 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 * the new palette contents, and update the GtkSettings property
* "gtk-color-palette" so all GtkColorSelection widgets will be modified. * "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 * gtk_color_selection_set_change_palette_with_screen_hook(), and does
* not work in multihead environments. * not work in multihead environments.
* *
* Return value: the previous change palette hook (that was replaced).
**/ **/
GtkColorSelectionChangePaletteFunc GtkColorSelectionChangePaletteFunc
gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func) gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func)

2
gtk/gtkcolorsel.h
View File

@ -110,9 +110,11 @@ gboolean gtk_color_selection_palette_from_string (const gchar *str,
gchar* gtk_color_selection_palette_to_string (const GdkColor *colors, gchar* gtk_color_selection_palette_to_string (const GdkColor *colors,
gint n_colors); gint n_colors);
#ifndef GTK_DISABLE_DEPRECATED
#ifndef GDK_MULTIHEAD_SAFE #ifndef GDK_MULTIHEAD_SAFE
GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func); GtkColorSelectionChangePaletteFunc gtk_color_selection_set_change_palette_hook (GtkColorSelectionChangePaletteFunc func);
#endif #endif
#endif
GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func); GtkColorSelectionChangePaletteWithScreenFunc gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChangePaletteWithScreenFunc func);