dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: port more deprecations to GIMP_DEPRECATED

This commit is contained in:
Michael Natterer 2012-05-06 00:30:54 +02:00
parent e7e8c9ef0a
commit 012457e81d
4 changed files with 6 additions and 9 deletions

7
libgimpwidgets/gimpcolordisplay.h
View File

@ -96,22 +96,19 @@ struct _GimpColorDisplayClass
GType gimp_color_display_get_type (void) G_GNUC_CONST;
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(g_object_new)
GimpColorDisplay * gimp_color_display_new (GType display_type);
#endif
GimpColorDisplay * gimp_color_display_clone (GimpColorDisplay *display);
void gimp_color_display_convert_surface (GimpColorDisplay *display,
cairo_surface_t *surface);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_color_display_convert_surface)
void gimp_color_display_convert (GimpColorDisplay *display,
guchar *buf,
gint width,
gint height,
gint bpp,
gint bpl);
#endif
void gimp_color_display_load_state (GimpColorDisplay *display,
GimpParasite *state);
GimpParasite * gimp_color_display_save_state (GimpColorDisplay *display);

2
libgimpwidgets/gimpcolordisplaystack.c
View File

@ -342,7 +342,9 @@ gimp_color_display_stack_convert (GimpColorDisplayStack *stack,
{
GimpColorDisplay *display = list->data;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gimp_color_display_convert (display, buf, width, height, bpp, bpl);
G_GNUC_END_IGNORE_DEPRECATIONS
}
}

3
libgimpwidgets/gimpcolordisplaystack.h
View File

@ -87,14 +87,13 @@ void gimp_color_display_stack_reorder_down (GimpColorDisplayStack *stack,
GimpColorDisplay *display);
void gimp_color_display_stack_convert_surface (GimpColorDisplayStack *stack,
cairo_surface_t *surface);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_color_display_stack_convert_surface)
void gimp_color_display_stack_convert (GimpColorDisplayStack *stack,
guchar *buf,
gint width,
gint height,
gint bpp,
gint bpl);
#endif
G_END_DECLS

3
libgimpwidgets/gimppropwidgets.h
View File

@ -208,11 +208,10 @@ GtkWidget * gimp_prop_color_area_new (GObject *config,
GtkWidget * gimp_prop_unit_combo_box_new (GObject *config,
const gchar *property_name);
#ifndef GIMP_DISABLE_DEPRECATED
GIMP_DEPRECATED_FOR(gimp_prop_unit_combo_box_new)
GtkWidget * gimp_prop_unit_menu_new (GObject *config,
const gchar *property_name,
const gchar *unit_format);
#endif /* GIMP_DISABLE_DEPRECATED */
/* GParamString (stock_id) */