diff --git a/libgimp/gimp.c b/libgimp/gimp.c index 2d38a0e055..00b3a427cb 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -97,7 +97,6 @@ #include "libgimpbase/gimpprotocol.h" #include "libgimpbase/gimpwire.h" -#undef GIMP_DISABLE_DEPRECATED #include "gimp.h" #include "gimpunitcache.h" diff --git a/libgimp/gimp.h b/libgimp/gimp.h index 5d7bafd1c7..5a05e4ef12 100644 --- a/libgimp/gimp.h +++ b/libgimp/gimp.h @@ -334,20 +334,25 @@ guint32 gimp_user_time (void) G_GNUC_CONST; const gchar * gimp_get_progname (void) G_GNUC_CONST; -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED gboolean gimp_install_cmap (void) G_GNUC_CONST; +GIMP_DEPRECATED gint gimp_min_colors (void) G_GNUC_CONST; +GIMP_DEPRECATED_FOR(gimp_get_parasite) GimpParasite * gimp_parasite_find (const gchar *name); +GIMP_DEPRECATED_FOR(gimp_parasite_attach) gboolean gimp_parasite_attach (const GimpParasite *parasite); +GIMP_DEPRECATED_FOR(gimp_parasite_detach) gboolean gimp_parasite_detach (const gchar *name); +GIMP_DEPRECATED_FOR(gimp_get_parasite_list) gboolean gimp_parasite_list (gint *num_parasites, gchar ***parasites); +GIMP_DEPRECATED_FOR(gimp_parasite_attach) gboolean gimp_attach_new_parasite (const gchar *name, gint flags, gint size, gconstpointer data); -#endif /* GIMP_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/libgimp/gimpbrushes.c b/libgimp/gimpbrushes.c index 81273adc6c..3875937c44 100644 --- a/libgimp/gimpbrushes.c +++ b/libgimp/gimpbrushes.c @@ -23,8 +23,6 @@ #include #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_BRUSHES_H__ #include "gimpbrushes.h" /** diff --git a/libgimp/gimpbrushes.h b/libgimp/gimpbrushes.h index 73b7e6ee0e..badf300b2f 100644 --- a/libgimp/gimpbrushes.h +++ b/libgimp/gimpbrushes.h @@ -29,16 +29,17 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_context_get_opacity) gdouble gimp_brushes_get_opacity (void); +GIMP_DEPRECATED_FOR(gimp_context_set_opacity) gboolean gimp_brushes_set_opacity (gdouble opacity); +GIMP_DEPRECATED_FOR(gimp_context_get_paint_mode) GimpLayerModeEffects gimp_brushes_get_paint_mode (void); +GIMP_DEPRECATED_FOR(gimp_context_set_paint_mode) gboolean gimp_brushes_set_paint_mode (GimpLayerModeEffects paint_mode); +GIMP_DEPRECATED_FOR(gimp_context_set_brush) gboolean gimp_brushes_set_brush (const gchar *name); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GIMP_BRUSHES_H__ */ diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index d1030a017a..d0da367481 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -26,10 +26,8 @@ #include "gimp.h" #include "gimpuitypes.h" -#include "gimpbrushselectbutton.h" - -#undef GIMP_DISABLE_DEPRECATED #include "gimpbrushmenu.h" +#include "gimpbrushselectbutton.h" /** diff --git a/libgimp/gimpbrushmenu.h b/libgimp/gimpbrushmenu.h index 23964eb801..c11aad17db 100644 --- a/libgimp/gimpbrushmenu.h +++ b/libgimp/gimpbrushmenu.h @@ -29,11 +29,9 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - G_BEGIN_DECLS - +GIMP_DEPRECATED_FOR(gimp_brush_select_button_new) GtkWidget * gimp_brush_select_widget_new (const gchar *title, const gchar *brush_name, gdouble opacity, @@ -42,7 +40,9 @@ GtkWidget * gimp_brush_select_widget_new (const gchar *title, GimpRunBrushCallback callback, gpointer data); +GIMP_DEPRECATED_FOR(gimp_select_button_close_popup) void gimp_brush_select_widget_close (GtkWidget *widget); +GIMP_DEPRECATED_FOR(gimp_brush_select_button_set_brush) void gimp_brush_select_widget_set (GtkWidget *widget, const gchar *brush_name, gdouble opacity, @@ -52,6 +52,4 @@ void gimp_brush_select_widget_set (GtkWidget *widget, G_END_DECLS -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_BRUSH_MENU_H__ */ diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index 00e172549d..da7b81ec4e 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -20,7 +20,6 @@ #include "config.h" -#undef GIMP_DISABLE_DEPRECATED #include "gimp.h" #include "gimptilebackendplugin.h" diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h index 2bd03bbde8..1e510d169e 100644 --- a/libgimp/gimpdrawable.h +++ b/libgimp/gimpdrawable.h @@ -76,41 +76,59 @@ guchar * gimp_drawable_get_sub_thumbnail_data (gint32 drawable_ID, gint *dest_height, gint *bpp); -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(gimp_item_is_valid) gboolean gimp_drawable_is_valid (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_is_layer) gboolean gimp_drawable_is_layer (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_is_text_layer) gboolean gimp_drawable_is_text_layer (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_is_layer_mask) gboolean gimp_drawable_is_layer_mask (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_is_channel) gboolean gimp_drawable_is_channel (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_delete) gboolean gimp_drawable_delete (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_image) gint32 gimp_drawable_get_image (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_name) gchar* gimp_drawable_get_name (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_name) gboolean gimp_drawable_set_name (gint32 drawable_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_get_visible) gboolean gimp_drawable_get_visible (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_visible) gboolean gimp_drawable_set_visible (gint32 drawable_ID, gboolean visible); +GIMP_DEPRECATED_FOR(gimp_item_get_linked) gboolean gimp_drawable_get_linked (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_linked) gboolean gimp_drawable_set_linked (gint32 drawable_ID, gboolean linked); +GIMP_DEPRECATED_FOR(gimp_item_get_tattoo) gint gimp_drawable_get_tattoo (gint32 drawable_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_tattoo) gboolean gimp_drawable_set_tattoo (gint32 drawable_ID, gint tattoo); +GIMP_DEPRECATED_FOR(gimp_item_get_parasite) GimpParasite * gimp_drawable_parasite_find (gint32 drawable_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_attach_parasite) gboolean gimp_drawable_parasite_attach (gint32 drawable_ID, const GimpParasite *parasite); +GIMP_DEPRECATED_FOR(gimp_item_detach_parasite) gboolean gimp_drawable_parasite_detach (gint32 drawable_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_get_parasite_list) gboolean gimp_drawable_parasite_list (gint32 drawable_ID, gint *num_parasites, gchar ***parasites); +GIMP_DEPRECATED_FOR(gimp_item_attach_parasite) gboolean gimp_drawable_attach_new_parasite (gint32 drawable_ID, const gchar *name, gint flags, gint size, gconstpointer data); -#endif /* GIMP_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/libgimp/gimpfontmenu.c b/libgimp/gimpfontmenu.c index 4588838233..7d4b8541a7 100644 --- a/libgimp/gimpfontmenu.c +++ b/libgimp/gimpfontmenu.c @@ -26,10 +26,8 @@ #include "gimp.h" #include "gimpuitypes.h" -#include "gimpfontselectbutton.h" - -#undef GIMP_DISABLE_DEPRECATED #include "gimpfontmenu.h" +#include "gimpfontselectbutton.h" /** diff --git a/libgimp/gimpfontmenu.h b/libgimp/gimpfontmenu.h index 05f378088d..a68830a9b1 100644 --- a/libgimp/gimpfontmenu.h +++ b/libgimp/gimpfontmenu.h @@ -29,23 +29,21 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - G_BEGIN_DECLS - +GIMP_DEPRECATED_FOR(gimp_font_select_button_new) GtkWidget * gimp_font_select_widget_new (const gchar *title, const gchar *font_name, GimpRunFontCallback callback, gpointer data); +GIMP_DEPRECATED_FOR(gimp_select_button_close_popup) void gimp_font_select_widget_close (GtkWidget *widget); +GIMP_DEPRECATED_FOR(gimp_font_select_button_set_font) void gimp_font_select_widget_set (GtkWidget *widget, const gchar *font_name); G_END_DECLS -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_FONT_MENU_H__ */ diff --git a/libgimp/gimpgradientmenu.c b/libgimp/gimpgradientmenu.c index d1169532f1..ede9087ae2 100644 --- a/libgimp/gimpgradientmenu.c +++ b/libgimp/gimpgradientmenu.c @@ -26,10 +26,8 @@ #include "gimp.h" #include "gimpuitypes.h" -#include "gimpgradientselectbutton.h" - -#undef GIMP_DISABLE_DEPRECATED #include "gimpgradientmenu.h" +#include "gimpgradientselectbutton.h" /** diff --git a/libgimp/gimpgradientmenu.h b/libgimp/gimpgradientmenu.h index 169ccbb470..f9da35db85 100644 --- a/libgimp/gimpgradientmenu.h +++ b/libgimp/gimpgradientmenu.h @@ -29,23 +29,21 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - G_BEGIN_DECLS - +GIMP_DEPRECATED_FOR(gimp_gradient_select_button_new) GtkWidget * gimp_gradient_select_widget_new (const gchar *title, const gchar *gradient_name, GimpRunGradientCallback callback, gpointer data); +GIMP_DEPRECATED_FOR(gimp_select_button_close_popup) void gimp_gradient_select_widget_close (GtkWidget *widget); +GIMP_DEPRECATED_FOR(gimp_gradient_select_button_set_gradient) void gimp_gradient_select_widget_set (GtkWidget *widget, const gchar *gradient_name); G_END_DECLS -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_GRADIENT_MENU_H__ */ diff --git a/libgimp/gimpgradients.c b/libgimp/gimpgradients.c index 81328053bc..586cb024ee 100644 --- a/libgimp/gimpgradients.c +++ b/libgimp/gimpgradients.c @@ -23,8 +23,6 @@ #include #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_GRADIENTS_H__ #include "gimpgradients.h" /** diff --git a/libgimp/gimpgradients.h b/libgimp/gimpgradients.h index ebd4319bdd..484ca0ca95 100644 --- a/libgimp/gimpgradients.h +++ b/libgimp/gimpgradients.h @@ -29,13 +29,11 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_context_get_gradient) gchar * gimp_gradients_get_gradient (void); +GIMP_DEPRECATED_FOR(gimp_context_set_gradient) gboolean gimp_gradients_set_gradient (const gchar *name); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GIMP_GRADIENTS_H__ */ diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c index a1dc13223e..f6ef79d5e7 100644 --- a/libgimp/gimpimage.c +++ b/libgimp/gimpimage.c @@ -21,8 +21,6 @@ #include "config.h" #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_IMAGE_H__ #include "gimpimage.h" /** diff --git a/libgimp/gimpimage.h b/libgimp/gimpimage.h index 33db3bb594..f25b9d739a 100644 --- a/libgimp/gimpimage.h +++ b/libgimp/gimpimage.h @@ -41,54 +41,71 @@ guchar * gimp_image_get_thumbnail_data (gint32 image_ID, gint *height, gint *bpp); -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(gimp_image_get_colormap) guchar * gimp_image_get_cmap (gint32 image_ID, gint *num_colors); +GIMP_DEPRECATED_FOR(gimp_image_set_colormap) gboolean gimp_image_set_cmap (gint32 image_ID, const guchar *cmap, gint num_colors); +GIMP_DEPRECATED_FOR(gimp_image_get_item_position) gint gimp_image_get_layer_position (gint32 image_ID, gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_image_raise_item) gboolean gimp_image_raise_layer (gint32 image_ID, gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_image_lower_item) gboolean gimp_image_lower_layer (gint32 image_ID, gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_image_raise_item_to_top) gboolean gimp_image_raise_layer_to_top (gint32 image_ID, gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_image_lower_item_to_bottom) gboolean gimp_image_lower_layer_to_bottom (gint32 image_ID, gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_image_get_item_position) gint gimp_image_get_channel_position (gint32 image_ID, gint32 channel_ID); +GIMP_DEPRECATED_FOR(gimp_image_raise_item) gboolean gimp_image_raise_channel (gint32 image_ID, gint32 channel_ID); +GIMP_DEPRECATED_FOR(gimp_image_lower_item) gboolean gimp_image_lower_channel (gint32 image_ID, gint32 channel_ID); +GIMP_DEPRECATED_FOR(gimp_image_get_item_position) gint gimp_image_get_vectors_position (gint32 image_ID, gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_image_raise_item) gboolean gimp_image_raise_vectors (gint32 image_ID, gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_image_lower_item) gboolean gimp_image_lower_vectors (gint32 image_ID, gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_image_raise_item_to_top) gboolean gimp_image_raise_vectors_to_top (gint32 image_ID, gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_image_lower_item_to_bottom) gboolean gimp_image_lower_vectors_to_bottom (gint32 image_ID, gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_image_get_parasite) GimpParasite * gimp_image_parasite_find (gint32 image_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_image_attach_parasite) gboolean gimp_image_parasite_attach (gint32 image_ID, const GimpParasite *parasite); +GIMP_DEPRECATED_FOR(gimp_image_detach_parasite) gboolean gimp_image_parasite_detach (gint32 image_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_image_get_parasite_list) gboolean gimp_image_parasite_list (gint32 image_ID, gint *num_parasites, gchar ***parasites); +GIMP_DEPRECATED_FOR(gimp_image_attach_parasite) gboolean gimp_image_attach_new_parasite (gint32 image_ID, const gchar *name, gint flags, gint size, gconstpointer data); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c index af210a46c1..430d9fe2b1 100644 --- a/libgimp/gimplayer.c +++ b/libgimp/gimplayer.c @@ -23,8 +23,6 @@ #include #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_LAYER_H__ #include "gimplayer.h" diff --git a/libgimp/gimplayer.h b/libgimp/gimplayer.h index e1611a5940..1c9a3085c7 100644 --- a/libgimp/gimplayer.h +++ b/libgimp/gimplayer.h @@ -52,12 +52,11 @@ gint32 gimp_layer_new_from_surface (gint32 image_ID, gdouble progress_start, gdouble progress_end); - -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(gimp_layer_get_lock_alpha) gboolean gimp_layer_get_preserve_trans (gint32 layer_ID); +GIMP_DEPRECATED_FOR(gimp_layer_set_lock_alpha) gboolean gimp_layer_set_preserve_trans (gint32 layer_ID, gboolean preserve_trans); -#endif /* GIMP_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/libgimp/gimpmenu.h b/libgimp/gimpmenu.h index 491ed30138..1f3f638167 100644 --- a/libgimp/gimpmenu.h +++ b/libgimp/gimpmenu.h @@ -29,11 +29,9 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - - G_BEGIN_DECLS +#ifndef GIMP_DISABLE_DEPRECATED typedef gboolean (* GimpConstraintFunc) (gint32 image_id, gint32 drawable_id, @@ -42,27 +40,29 @@ typedef void (* GimpMenuCallback) (gint32 any_id, gpointer data); +GIMP_DEPRECATED_FOR(gimp_image_combo_box_new) GtkWidget * gimp_image_menu_new (GimpConstraintFunc constraint, GimpMenuCallback callback, gpointer data, gint32 active_image); +GIMP_DEPRECATED_FOR(gimp_layer_combo_box_new) GtkWidget * gimp_layer_menu_new (GimpConstraintFunc constraint, GimpMenuCallback callback, gpointer data, gint32 active_layer); +GIMP_DEPRECATED_FOR(gimp_channel_combo_box_new) GtkWidget * gimp_channel_menu_new (GimpConstraintFunc constraint, GimpMenuCallback callback, gpointer data, gint32 active_channel); +GIMP_DEPRECATED_FOR(gimp_drawable_combo_box_new) GtkWidget * gimp_drawable_menu_new (GimpConstraintFunc constraint, GimpMenuCallback callback, gpointer data, gint32 active_drawable); +#endif /* GIMP_DISABLE_DEPRECATED */ G_END_DECLS - -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_MENU_H__ */ diff --git a/libgimp/gimppalette.c b/libgimp/gimppalette.c index 5e40fc471a..3394d2a402 100644 --- a/libgimp/gimppalette.c +++ b/libgimp/gimppalette.c @@ -21,9 +21,6 @@ #include "config.h" #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_PALETTE_H__ -#include "gimppalette.h" /** * gimp_palette_get_foreground: diff --git a/libgimp/gimppalette.h b/libgimp/gimppalette.h index 6beef595ce..af05500d5b 100644 --- a/libgimp/gimppalette.h +++ b/libgimp/gimppalette.h @@ -29,18 +29,19 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_context_get_foreground) gboolean gimp_palette_get_foreground (GimpRGB *foreground); +GIMP_DEPRECATED_FOR(gimp_context_get_background) gboolean gimp_palette_get_background (GimpRGB *background); +GIMP_DEPRECATED_FOR(gimp_context_set_foreground) gboolean gimp_palette_set_foreground (const GimpRGB *foreground); +GIMP_DEPRECATED_FOR(gimp_context_set_background) gboolean gimp_palette_set_background (const GimpRGB *background); +GIMP_DEPRECATED_FOR(gimp_context_set_default_colors) gboolean gimp_palette_set_default_colors (void); +GIMP_DEPRECATED_FOR(gimp_context_swap_colors) gboolean gimp_palette_swap_colors (void); -#endif /* GIMP_DISABLE_DEPRECATED */ - - G_END_DECLS #endif /* __GIMP_PALETTE_H__ */ diff --git a/libgimp/gimppalettemenu.c b/libgimp/gimppalettemenu.c index 4c310b56c1..e2254e83f0 100644 --- a/libgimp/gimppalettemenu.c +++ b/libgimp/gimppalettemenu.c @@ -26,10 +26,8 @@ #include "gimp.h" #include "gimpuitypes.h" -#include "gimppaletteselectbutton.h" - -#undef GIMP_DISABLE_DEPRECATED #include "gimppalettemenu.h" +#include "gimppaletteselectbutton.h" /** diff --git a/libgimp/gimppalettemenu.h b/libgimp/gimppalettemenu.h index 2368a18a3c..87c60ca9af 100644 --- a/libgimp/gimppalettemenu.h +++ b/libgimp/gimppalettemenu.h @@ -29,23 +29,21 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - G_BEGIN_DECLS - +GIMP_DEPRECATED_FOR(gimp_gradient_select_button_new) GtkWidget * gimp_palette_select_widget_new (const gchar *title, const gchar *palette_name, GimpRunPaletteCallback callback, gpointer data); +GIMP_DEPRECATED_FOR(gimp_select_button_close_popup) void gimp_palette_select_widget_close (GtkWidget *widget); +GIMP_DEPRECATED_FOR(gimp_gradient_select_button_set_gradient) void gimp_palette_select_widget_set (GtkWidget *widget, const gchar *palette_name); G_END_DECLS -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_PALETTE_MENU_H__ */ diff --git a/libgimp/gimppalettes.c b/libgimp/gimppalettes.c index 751f32694e..0f4eb72f48 100644 --- a/libgimp/gimppalettes.c +++ b/libgimp/gimppalettes.c @@ -21,8 +21,6 @@ #include "config.h" #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_PALETTES_H__ #include "gimppalettes.h" /** diff --git a/libgimp/gimppalettes.h b/libgimp/gimppalettes.h index 1aa80b9a05..a1186951e5 100644 --- a/libgimp/gimppalettes.h +++ b/libgimp/gimppalettes.h @@ -29,12 +29,9 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_context_set_gradient) gboolean gimp_palettes_set_palette (const gchar *name); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GIMP_PALETTES_H__ */ diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c index 8c348f96d6..8903b0b0bc 100644 --- a/libgimp/gimppatternmenu.c +++ b/libgimp/gimppatternmenu.c @@ -26,10 +26,8 @@ #include "gimp.h" #include "gimpuitypes.h" -#include "gimppatternselectbutton.h" - -#undef GIMP_DISABLE_DEPRECATED #include "gimppatternmenu.h" +#include "gimppatternselectbutton.h" /** diff --git a/libgimp/gimppatternmenu.h b/libgimp/gimppatternmenu.h index 0c95f6638e..de6772fcd2 100644 --- a/libgimp/gimppatternmenu.h +++ b/libgimp/gimppatternmenu.h @@ -29,23 +29,21 @@ * written code. */ -#ifndef GIMP_DISABLE_DEPRECATED - G_BEGIN_DECLS - +GIMP_DEPRECATED_FOR(gimp_pattern_select_button_new) GtkWidget * gimp_pattern_select_widget_new (const gchar *title, const gchar *pattern_name, GimpRunPatternCallback callback, gpointer data); +GIMP_DEPRECATED_FOR(gimp_select_button_close_popup) void gimp_pattern_select_widget_close (GtkWidget *widget); +GIMP_DEPRECATED_FOR(gimp_pattern_select_button_set_brush) void gimp_pattern_select_widget_set (GtkWidget *widget, const gchar *pattern_name); G_END_DECLS -#endif /* GIMP_DISABLE_DEPRECATED */ - #endif /* __GIMP_PATTERN_MENU_H__ */ diff --git a/libgimp/gimppatterns.c b/libgimp/gimppatterns.c index d93f79573d..68bc22b7f5 100644 --- a/libgimp/gimppatterns.c +++ b/libgimp/gimppatterns.c @@ -23,8 +23,6 @@ #include #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_PATTERNS_H__ #include "gimppatterns.h" /** diff --git a/libgimp/gimppatterns.h b/libgimp/gimppatterns.h index 23b8885017..3d8cbcdadb 100644 --- a/libgimp/gimppatterns.h +++ b/libgimp/gimppatterns.h @@ -29,12 +29,9 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_context_set_pattern) gboolean gimp_patterns_set_pattern (const gchar *name); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GIMP_PATTERNS_H__ */ diff --git a/libgimp/gimpprogress.c b/libgimp/gimpprogress.c index 5ecadce0aa..6d47625094 100644 --- a/libgimp/gimpprogress.c +++ b/libgimp/gimpprogress.c @@ -22,6 +22,8 @@ #include +#include "libgimpbase/gimpbase.h" + #undef GIMP_DISABLE_DEPRECATED #include "gimpprogress.h" #define GIMP_DISABLE_DEPRECATED diff --git a/libgimp/gimpprogress.h b/libgimp/gimpprogress.h index a0c08f01f0..1be585e826 100644 --- a/libgimp/gimpprogress.h +++ b/libgimp/gimpprogress.h @@ -80,7 +80,7 @@ typedef void (* GimpProgressTextCallback) (const gchar *message, typedef void (* GimpProgressValueCallback) (gdouble percentage, gpointer user_data); - +GIMP_DEPRECATED_FOR(gimp_progress_install_vtable) const gchar * gimp_progress_install (GimpProgressStartCallback start_callback, GimpProgressEndCallback end_callback, GimpProgressTextCallback text_callback, diff --git a/libgimp/gimpselection.c b/libgimp/gimpselection.c index 0312bc3caa..87a8a667ed 100644 --- a/libgimp/gimpselection.c +++ b/libgimp/gimpselection.c @@ -21,9 +21,6 @@ #include "config.h" #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_SELECTION_H__ -#include "gimpselection.h" /** * gimp_selection_float: diff --git a/libgimp/gimpselection.h b/libgimp/gimpselection.h index e3b28f2e06..14ff943753 100644 --- a/libgimp/gimpselection.h +++ b/libgimp/gimpselection.h @@ -35,12 +35,9 @@ gint32 gimp_selection_float (gint32 image_ID, gint offx, gint offy); -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(gimp_selection_none) gboolean gimp_selection_clear (gint32 image_ID); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c index c98e15aca3..947423a6f5 100644 --- a/libgimp/gimpui.c +++ b/libgimp/gimpui.c @@ -28,11 +28,11 @@ #include #endif -#include "libgimpmodule/gimpmodule.h" - #include "gimp.h" #include "gimpui.h" +#include "libgimpmodule/gimpmodule.h" + #include "libgimpwidgets/gimpwidgets.h" #include "libgimpwidgets/gimpwidgets-private.h" diff --git a/libgimp/gimpvectors.c b/libgimp/gimpvectors.c index 9b53e0de1e..03ed6372ef 100644 --- a/libgimp/gimpvectors.c +++ b/libgimp/gimpvectors.c @@ -23,8 +23,6 @@ #include #include "gimp.h" -#undef GIMP_DISABLE_DEPRECATED -#undef __GIMP_VECTORS_H__ #include "gimpvectors.h" diff --git a/libgimp/gimpvectors.h b/libgimp/gimpvectors.h index 15c266f7ae..2f5acea621 100644 --- a/libgimp/gimpvectors.h +++ b/libgimp/gimpvectors.h @@ -30,31 +30,43 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(gimp_item_is_valid) gboolean gimp_vectors_is_valid (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_image) gint32 gimp_vectors_get_image (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_name) gchar * gimp_vectors_get_name (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_name) gboolean gimp_vectors_set_name (gint32 vectors_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_get_visible) gboolean gimp_vectors_get_visible (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_get_visible) gboolean gimp_vectors_set_visible (gint32 vectors_ID, gboolean visible); +GIMP_DEPRECATED_FOR(gimp_item_get_linked) gboolean gimp_vectors_get_linked (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_linked) gboolean gimp_vectors_set_linked (gint32 vectors_ID, gboolean linked); +GIMP_DEPRECATED_FOR(gimp_item_get_tattoo) gint gimp_vectors_get_tattoo (gint32 vectors_ID); +GIMP_DEPRECATED_FOR(gimp_item_set_tattoo) gboolean gimp_vectors_set_tattoo (gint32 vectors_ID, gint tattoo); +GIMP_DEPRECATED_FOR(gimp_item_get_parasite) GimpParasite * gimp_vectors_parasite_find (gint32 vectors_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_attach_parasite) gboolean gimp_vectors_parasite_attach (gint32 vectors_ID, const GimpParasite *parasite); +GIMP_DEPRECATED_FOR(gimp_item_detach_parasite) gboolean gimp_vectors_parasite_detach (gint32 vectors_ID, const gchar *name); +GIMP_DEPRECATED_FOR(gimp_item_get_parasite_list) gboolean gimp_vectors_parasite_list (gint32 vectors_ID, gint *num_parasites, gchar ***parasites); -#endif /* GIMP_DISABLE_DEPRECATED */ G_END_DECLS diff --git a/libgimpbase/gimpbasetypes.h b/libgimpbase/gimpbasetypes.h index e53a6dfd21..4d67f75150 100644 --- a/libgimpbase/gimpbasetypes.h +++ b/libgimpbase/gimpbasetypes.h @@ -32,6 +32,19 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ +/* XXX FIXME move these to a separate file */ + +#ifdef GIMP_DISABLE_DEPRECATION_WARNINGS +#define GIMP_DEPRECATED +#define GIMP_DEPRECATED_FOR(f) +#define GIMP_UNAVAILABLE(maj,min) +#else +#define GIMP_DEPRECATED G_DEPRECATED +#define GIMP_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) +#define GIMP_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) +#endif + + typedef struct _GimpParasite GimpParasite; typedef struct _GimpDatafileData GimpDatafileData; typedef struct _GimpEnumDesc GimpEnumDesc; diff --git a/libgimpbase/gimpenv.h b/libgimpbase/gimpenv.h index d156303cef..ca3db809d8 100644 --- a/libgimpbase/gimpenv.h +++ b/libgimpbase/gimpenv.h @@ -54,6 +54,7 @@ const gchar * gimp_sysconf_directory (void) G_GNUC_CONST; const gchar * gimp_plug_in_directory (void) G_GNUC_CONST; #ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(g_get_user_special_dir) const gchar * gimp_user_directory (GimpUserDirectory type) G_GNUC_CONST; #endif /* !GIMP_DISABLE_DEPRECATED */ diff --git a/libgimpbase/gimpmemsize.c b/libgimpbase/gimpmemsize.c index 92f6dd0738..552a5b7be5 100644 --- a/libgimpbase/gimpmemsize.c +++ b/libgimpbase/gimpmemsize.c @@ -22,7 +22,8 @@ #include -#undef GIMP_DISABLE_DEPRECATED +#include "gimpbasetypes.h" + #include "gimpmemsize.h" #include "libgimp/libgimp-intl.h" diff --git a/libgimpbase/gimpmemsize.h b/libgimpbase/gimpmemsize.h index 1fe0d70ec7..17a5a6b109 100644 --- a/libgimpbase/gimpmemsize.h +++ b/libgimpbase/gimpmemsize.h @@ -41,12 +41,9 @@ gchar * gimp_memsize_serialize (guint64 memsize) G_GNUC_MALLOC; gboolean gimp_memsize_deserialize (const gchar *string, guint64 *memsize); -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(g_format_size) gchar * gimp_memsize_to_string (guint64 memsize) G_GNUC_MALLOC; -#endif /* GIMP_DISABLE_DEPRECATED */ - /* * GIMP_TYPE_PARAM_MEMSIZE diff --git a/libgimpbase/gimpwire.c b/libgimpbase/gimpwire.c index 8c08238a4f..87945095af 100644 --- a/libgimpbase/gimpwire.c +++ b/libgimpbase/gimpwire.c @@ -20,7 +20,7 @@ #include -#include +#include #include diff --git a/libgimpcolor/gimpcolortypes.h b/libgimpcolor/gimpcolortypes.h index e2f5aaccc4..14fc1895db 100644 --- a/libgimpcolor/gimpcolortypes.h +++ b/libgimpcolor/gimpcolortypes.h @@ -19,6 +19,10 @@ #ifndef __GIMP_COLOR_TYPES_H__ #define __GIMP_COLOR_TYPES_H__ + +#include + + G_BEGIN_DECLS /* For information look into the C source or the html documentation */ diff --git a/libgimpcolor/gimprgb.c b/libgimpcolor/gimprgb.c index 8cb064b34c..042d8803ec 100644 --- a/libgimpcolor/gimprgb.c +++ b/libgimpcolor/gimprgb.c @@ -21,6 +21,7 @@ #include #include +#define GIMP_DISABLE_DEPRECATION_WARNINGS /* for GIMP_RGB_INTENSITY() */ #include "libgimpmath/gimpmath.h" #include "gimpcolortypes.h" diff --git a/libgimpcolor/gimprgb.h b/libgimpcolor/gimprgb.h index 8646978866..d5ece7e914 100644 --- a/libgimpcolor/gimprgb.h +++ b/libgimpcolor/gimprgb.h @@ -125,10 +125,10 @@ void gimp_rgb_gamma (GimpRGB *rgb, gdouble gimp_rgb_luminance (const GimpRGB *rgb); guchar gimp_rgb_luminance_uchar (const GimpRGB *rgb); -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(gimp_rgb_luminance) gdouble gimp_rgb_intensity (const GimpRGB *rgb); +GIMP_DEPRECATED_FOR(gimp_rgb_luminance_uchar) guchar gimp_rgb_intensity_uchar (const GimpRGB *rgb); -#endif void gimp_rgb_composite (GimpRGB *color1, const GimpRGB *color2, diff --git a/libgimpmath/gimpmathtypes.h b/libgimpmath/gimpmathtypes.h index 03478f5dd6..3376c3e674 100644 --- a/libgimpmath/gimpmathtypes.h +++ b/libgimpmath/gimpmathtypes.h @@ -21,6 +21,10 @@ #ifndef __GIMP_MATH_TYPES_H__ #define __GIMP_MATH_TYPES_H__ + +#include + + G_BEGIN_DECLS typedef struct _GimpMatrix2 GimpMatrix2; diff --git a/libgimpmath/gimpmd5.c b/libgimpmath/gimpmd5.c index e3148847a3..712c3a9885 100644 --- a/libgimpmath/gimpmd5.c +++ b/libgimpmath/gimpmd5.c @@ -7,9 +7,10 @@ #include "config.h" -#include +#include + +#include "gimpmathtypes.h" -#undef GIMP_DISABLE_DEPRECATED #include "gimpmd5.h" diff --git a/libgimpmath/gimpmd5.h b/libgimpmath/gimpmd5.h index 0c22d63280..1e04e91df0 100644 --- a/libgimpmath/gimpmd5.h +++ b/libgimpmath/gimpmd5.h @@ -16,14 +16,11 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ -#ifndef GIMP_DISABLE_DEPRECATED - +GIMP_DEPRECATED_FOR(GChecksum) void gimp_md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]); -#endif /* GIMP_DISABLE_DEPRECATED */ - G_END_DECLS #endif /* __GIMP_MD5_H__ */ diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c index 0f4ac28dcc..b0bc3e7c53 100644 --- a/libgimpmodule/gimpmodule.c +++ b/libgimpmodule/gimpmodule.c @@ -27,7 +27,6 @@ #include "libgimpbase/gimpbase.h" -#undef GIMP_DISABLE_DEPRECATED #include "gimpmodule.h" #include "libgimp/libgimp-intl.h" diff --git a/libgimpmodule/gimpmodule.h b/libgimpmodule/gimpmodule.h index ed8cddbcd2..71c63ba0b6 100644 --- a/libgimpmodule/gimpmodule.h +++ b/libgimpmodule/gimpmodule.h @@ -221,12 +221,10 @@ void gimp_module_set_load_inhibit (GimpModule *module, const gchar * gimp_module_state_name (GimpModuleState state); - -#ifndef GIMP_DISABLE_DEPRECATED +GIMP_DEPRECATED_FOR(g_type_module_register_enum) GType gimp_module_register_enum (GTypeModule *module, const gchar *name, const GEnumValue *const_static_values); -#endif /* GIMP_DISABLE_DEPRECATED */ /* GimpModuleInfo functions */ diff --git a/libgimpmodule/gimpmoduletypes.h b/libgimpmodule/gimpmoduletypes.h index b6bed902dd..8cb76ebb17 100644 --- a/libgimpmodule/gimpmoduletypes.h +++ b/libgimpmodule/gimpmoduletypes.h @@ -19,6 +19,10 @@ #ifndef __GIMP_MODULE_TYPES_H__ #define __GIMP_MODULE_TYPES_H__ + +#include + + G_BEGIN_DECLS /* For information look into the C source or the html documentation */