Commit 16c08ae1 authored by Kjell Ahlstedt's avatar Kjell Ahlstedt Committed by Matthias Clasen

Fix some inconsistent deprecations

Some functions had only a deprecation comment in the .c file, or only a
deprecation annotation in the .h file. Add the missing parts.

https://bugzilla.gnome.org/show_bug.cgi?id=703616
parent fc6e725d
......@@ -178,9 +178,9 @@ gboolean gtk_action_group_get_visible (GtkActionGroup
GDK_DEPRECATED_IN_3_10
void gtk_action_group_set_visible (GtkActionGroup *action_group,
gboolean visible);
GDK_AVAILABLE_IN_3_6
GDK_DEPRECATED_IN_3_10
GtkAccelGroup *gtk_action_group_get_accel_group (GtkActionGroup *action_group);
GDK_AVAILABLE_IN_3_6
GDK_DEPRECATED_IN_3_10
void gtk_action_group_set_accel_group (GtkActionGroup *action_group,
GtkAccelGroup *accel_group);
......
......@@ -1889,6 +1889,12 @@ gtk_container_real_check_resize (GtkContainer *container)
* so we simply need to reallocate and let the allocation
* trickle down via GTK_WIDGET_ALLOC_NEEDED flags.
*/
/**
* gtk_container_resize_children:
* @container: a #GtkContainer
*
* Deprecated: 3.10
**/
void
gtk_container_resize_children (GtkContainer *container)
{
......
......@@ -748,11 +748,13 @@ _gtk_icon_helper_ensure_surface (GtkIconHelper *self,
break;
case GTK_IMAGE_STOCK:
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon_set = gtk_style_context_lookup_icon_set (context, self->priv->stock_id);
if (icon_set != NULL)
ensure_surface_for_icon_set (self, context, icon_set);
else
surface = NULL;
G_GNUC_END_IGNORE_DEPRECATIONS;
break;
case GTK_IMAGE_ICON_SET:
......
......@@ -217,9 +217,9 @@ void gtk_notebook_set_scrollable (GtkNotebook *notebook,
gboolean scrollable);
GDK_AVAILABLE_IN_ALL
gboolean gtk_notebook_get_scrollable (GtkNotebook *notebook);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_4
guint16 gtk_notebook_get_tab_hborder (GtkNotebook *notebook);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_4
guint16 gtk_notebook_get_tab_vborder (GtkNotebook *notebook);
/***********************************************************
......
......@@ -878,10 +878,10 @@ GDK_AVAILABLE_IN_ALL
void gtk_style_context_get_style (GtkStyleContext *context,
...);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_10_FOR(gtk_icon_theme_lookup_icon)
GtkIconSet * gtk_style_context_lookup_icon_set (GtkStyleContext *context,
const gchar *stock_id);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_10
GdkPixbuf * gtk_icon_set_render_icon_pixbuf (GtkIconSet *icon_set,
GtkStyleContext *context,
GtkIconSize size);
......@@ -1087,7 +1087,7 @@ void gtk_render_activity (GtkStyleContext *context,
gdouble y,
gdouble width,
gdouble height);
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_3_10_FOR(gtk_icon_theme_load_icon)
GdkPixbuf * gtk_render_icon_pixbuf (GtkStyleContext *context,
const GtkIconSource *source,
GtkIconSize size);
......
......@@ -9751,12 +9751,14 @@ gtk_widget_render_icon_pixbuf (GtkWidget *widget,
g_return_val_if_fail (size > GTK_ICON_SIZE_INVALID || size == -1, NULL);
context = gtk_widget_get_style_context (widget);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
icon_set = gtk_style_context_lookup_icon_set (context, stock_id);
if (icon_set == NULL)
return NULL;
return gtk_icon_set_render_icon_pixbuf (icon_set, context, size);
G_GNUC_END_IGNORE_DEPRECATIONS;
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment