diff --git a/ChangeLog b/ChangeLog index 143830a19f..12231e53d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-01-31 Matthias Clasen + * gtk/gtkselection.h: + * gtk/gtkselection.c (gtk_selection_clear): Deprecate. (#85683) + * gdk/gdkpixbuf.h: * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 143830a19f..12231e53d1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2003-01-31 Matthias Clasen + * gtk/gtkselection.h: + * gtk/gtkselection.c (gtk_selection_clear): Deprecate. (#85683) + * gdk/gdkpixbuf.h: * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 143830a19f..12231e53d1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,8 @@ 2003-01-31 Matthias Clasen + * gtk/gtkselection.h: + * gtk/gtkselection.c (gtk_selection_clear): Deprecate. (#85683) + * gdk/gdkpixbuf.h: * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 143830a19f..12231e53d1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2003-01-31 Matthias Clasen + * gtk/gtkselection.h: + * gtk/gtkselection.c (gtk_selection_clear): Deprecate. (#85683) + * gdk/gdkpixbuf.h: * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 143830a19f..12231e53d1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2003-01-31 Matthias Clasen + * gtk/gtkselection.h: + * gtk/gtkselection.c (gtk_selection_clear): Deprecate. (#85683) + * gdk/gdkpixbuf.h: * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_to_drawable): (gdk_pixbuf_render_to_drawable_alpha): Deprecate. (#60582) diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index bd5ac12d5f..738b79f537 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -1028,14 +1028,15 @@ gtk_selection_init (void) * @event: the event * * The default handler for the GtkWidget::selection_clear_event - * signal. Instead of calling this function, chain up from - * your selection_clear_event handler. Calling this function - * from any other context is illegal. This function will - * be deprecated in future versions of GTK+. + * signal. * * Return value: %TRUE if the event was handled, otherwise false * * Since: 2.2 + * + * Deprecated: Instead of calling this function, chain up from + * your selection_clear_event handler. Calling this function + * from any other context is illegal. **/ gboolean gtk_selection_clear (GtkWidget *widget, diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index ebaa22fb82..b26220d2ee 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -148,9 +148,10 @@ gboolean gtk_selection_data_targets_include_text (GtkSelectionData *selection_d void gtk_selection_remove_all (GtkWidget *widget); /* Event handlers */ - +#ifndef GTK_DISABLE_DEPRECATED gboolean gtk_selection_clear (GtkWidget *widget, GdkEventSelection *event); +#endif gboolean _gtk_selection_request (GtkWidget *widget, GdkEventSelection *event); gboolean _gtk_selection_incr_event (GdkWindow *window,