[gimp] libgimpwidgets: port more deprecations to GIMP_DEPRECATED

[Michael Natterer <mitch src gnome org>]

commit 012457e81d1bacde3ac8fec510893d6e2b302436
Author: Michael Natterer <mitch gimp org>
Date:   Sun May 6 00:30:54 2012 +0200

    libgimpwidgets: port more deprecations to GIMP_DEPRECATED

 libgimpwidgets/gimpcolordisplay.h      |    7 ++-----
 libgimpwidgets/gimpcolordisplaystack.c |    2 ++
 libgimpwidgets/gimpcolordisplaystack.h |    3 +--
 libgimpwidgets/gimppropwidgets.h       |    3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/libgimpwidgets/gimpcolordisplay.h b/libgimpwidgets/gimpcolordisplay.h
index 4282391..3d45311 100644
--- a/libgimpwidgets/gimpcolordisplay.h
+++ b/libgimpwidgets/gimpcolordisplay.h
@@ -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);
diff --git a/libgimpwidgets/gimpcolordisplaystack.c b/libgimpwidgets/gimpcolordisplaystack.c
index 0c22588..5a0401d 100644
--- a/libgimpwidgets/gimpcolordisplaystack.c
+++ b/libgimpwidgets/gimpcolordisplaystack.c
@@ -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
     }
 }
 
diff --git a/libgimpwidgets/gimpcolordisplaystack.h b/libgimpwidgets/gimpcolordisplaystack.h
index 6bd1a9a..d3e0304 100644
--- a/libgimpwidgets/gimpcolordisplaystack.h
+++ b/libgimpwidgets/gimpcolordisplaystack.h
@@ -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
 
diff --git a/libgimpwidgets/gimppropwidgets.h b/libgimpwidgets/gimppropwidgets.h
index 18b7d30..afff4b5 100644
--- a/libgimpwidgets/gimppropwidgets.h
+++ b/libgimpwidgets/gimppropwidgets.h
@@ -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)  */